[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[microblaze-uclinux] [PATCH] microblaze: Drop CMDLINE_FORCE



This patch is relative to 2.6.30-rc6.

CMDLINE_FORCE functionality is now provided within prom.c
based on the #definition of CONFIG_CMDLINE, so this Kconfig
parameter can be dropped.

Signed-off-by: Steven J. Magnani <steve@xxxxxxxxxxxxxxx>
---
diff -uprN a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
--- a/arch/microblaze/Kconfig	2009-05-20 13:21:13.000000000 -0500
+++ b/arch/microblaze/Kconfig	2009-05-20 13:23:45.000000000 -0500
@@ -94,14 +94,6 @@ config CMDLINE
 	  supply some command-line options at build time by entering them
 	  here.
 
-config CMDLINE_FORCE
-	bool "Force default kernel command string"
-	depends on CMDLINE_BOOL
-	default n
-	help
-	  Set this to have arguments from the default kernel command string
-	  override those passed by the boot loader.
-
 config OF
 	def_bool y
 
diff -uprN a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c
--- a/arch/microblaze/kernel/setup.c	2009-05-20 13:21:27.000000000 -0500
+++ b/arch/microblaze/kernel/setup.c	2009-05-20 13:23:28.000000000 -0500
@@ -42,10 +42,6 @@ char cmd_line[COMMAND_LINE_SIZE];
 
 void __init setup_arch(char **cmdline_p)
 {
-#ifdef CONFIG_CMDLINE_FORCE
-	strlcpy(cmd_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE);
-	strlcpy(boot_command_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE);
-#endif
 	*cmdline_p = cmd_line;
 
 	console_verbose();

___________________________
microblaze-uclinux mailing list
microblaze-uclinux@xxxxxxxxxxxxxx
Project Home Page : http://www.itee.uq.edu.au/~jwilliams/mblaze-uclinux
Mailing List Archive : http://www.itee.uq.edu.au/~listarch/microblaze-uclinux/