summaryrefslogtreecommitdiff
path: root/arch/arc
diff options
context:
space:
mode:
authorVineet Gupta <vgupta@synopsys.com>2013-04-09 16:12:01 +0530
committerVineet Gupta <vgupta@synopsys.com>2013-05-07 13:43:56 +0530
commit6971881f2ae0e0208375dc40e1a9a4ce56f7c9d6 (patch)
tree864923cf8e22cde50dc46677b9ea609498ac5f1f /arch/arc
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>
Diffstat (limited to 'arch/arc')
-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
Counts number of I and D TLB Misses and exports them via Debugfs
The counters can be cleared via Debugfs as well
-config CMDLINE
- string "Kernel command line to built-in"
- default "print-fatal-signals=1"
- help
- The default command line which will be appended to the optional
- u-boot provided command line (see below)
-
config CMDLINE_UBOOT
bool "Support U-boot kernel command line passing"
default n
@@ -423,8 +416,8 @@ config CMDLINE_UBOOT
command line from the U-boot environment to the Linux kernel then
switch this option on.
ARC U-boot will setup the cmdline in RAM/flash and set r2 to point
- to it. kernel startup code will copy the string into cmdline buffer
- and also append CONFIG_CMDLINE.
+ to it. kernel startup code will append this to DeviceTree
+ /bootargs provided cmdline args.
config ARC_BUILTIN_DTB_NAME
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)
/* Make sure that a whitespace is inserted before */
strlcat(command_line, " ", sizeof(command_line));
#endif
- /*
- * Append .config cmdline to base command line, which might already
- * contain u-boot "bootargs" (handled by head.S, if so configured)
- */
- strlcat(command_line, CONFIG_CMDLINE, sizeof(command_line));
/* Save unparsed command line copy for /proc/cmdline */
strlcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);