aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVineet Gupta <vgupta@synopsys.com>2013-04-09 06:42:01 -0400
committerVineet Gupta <vgupta@synopsys.com>2013-05-07 04:13:56 -0400
commit6971881f2ae0e0208375dc40e1a9a4ce56f7c9d6 (patch)
tree864923cf8e22cde50dc46677b9ea609498ac5f1f
parent330db3330a587996e43dc779a0a43afc01a87d9e (diff)
ARC: [cmdline] Remove CONFIG_CMDLINE
Given that DeviceTree /bootargs can provide similar functionality, no point in providing duplicate infrastructure. Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
-rw-r--r--arch/arc/Kconfig11
-rw-r--r--arch/arc/kernel/setup.c5
2 files changed, 2 insertions, 14 deletions
diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
index 73ed284ffa25..34974e230bad 100644
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
@@ -408,13 +408,6 @@ config ARC_DBG_TLB_MISS_COUNT
408 Counts number of I and D TLB Misses and exports them via Debugfs 408 Counts number of I and D TLB Misses and exports them via Debugfs
409 The counters can be cleared via Debugfs as well 409 The counters can be cleared via Debugfs as well
410 410
411config CMDLINE
412 string "Kernel command line to built-in"
413 default "print-fatal-signals=1"
414 help
415 The default command line which will be appended to the optional
416 u-boot provided command line (see below)
417
418config CMDLINE_UBOOT 411config CMDLINE_UBOOT
419 bool "Support U-boot kernel command line passing" 412 bool "Support U-boot kernel command line passing"
420 default n 413 default n
@@ -423,8 +416,8 @@ config CMDLINE_UBOOT
423 command line from the U-boot environment to the Linux kernel then 416 command line from the U-boot environment to the Linux kernel then
424 switch this option on. 417 switch this option on.
425 ARC U-boot will setup the cmdline in RAM/flash and set r2 to point 418 ARC U-boot will setup the cmdline in RAM/flash and set r2 to point
426 to it. kernel startup code will copy the string into cmdline buffer 419 to it. kernel startup code will append this to DeviceTree
427 and also append CONFIG_CMDLINE. 420 /bootargs provided cmdline args.
428 421
429config ARC_BUILTIN_DTB_NAME 422config ARC_BUILTIN_DTB_NAME
430 string "Built in DTB" 423 string "Built in DTB"
diff --git a/arch/arc/kernel/setup.c b/arch/arc/kernel/setup.c
index 197514649034..18763153e07c 100644
--- a/arch/arc/kernel/setup.c
+++ b/arch/arc/kernel/setup.c
@@ -322,11 +322,6 @@ void __init setup_arch(char **cmdline_p)
322 /* Make sure that a whitespace is inserted before */ 322 /* Make sure that a whitespace is inserted before */
323 strlcat(command_line, " ", sizeof(command_line)); 323 strlcat(command_line, " ", sizeof(command_line));
324#endif 324#endif
325 /*
326 * Append .config cmdline to base command line, which might already
327 * contain u-boot "bootargs" (handled by head.S, if so configured)
328 */
329 strlcat(command_line, CONFIG_CMDLINE, sizeof(command_line));
330 325
331 /* Save unparsed command line copy for /proc/cmdline */ 326 /* Save unparsed command line copy for /proc/cmdline */
332 strlcpy(boot_command_line, command_line, COMMAND_LINE_SIZE); 327 strlcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);