Explorar o código

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>
Vineet Gupta %!s(int64=12) %!d(string=hai) anos
pai
achega
6971881f2a
Modificáronse 2 ficheiros con 2 adicións e 14 borrados
  1. 2 9
      arch/arc/Kconfig
  2. 0 5
      arch/arc/kernel/setup.c

+ 2 - 9
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"

+ 0 - 5
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);