Thread (35 messages) read the whole thread 35 messages, 5 authors, 2021-04-02

Re: [PATCH v3 12/17] sh: Convert to GENERIC_CMDLINE

From: Christophe Leroy <hidden>
Date: 2021-04-02 15:36:19
Also in: linux-arch, linux-arm-kernel, linux-devicetree, linux-mips, linux-riscv, linux-sh, lkml, sparclinux


Le 26/03/2021 à 14:44, Christophe Leroy a écrit :
This converts the architecture to GENERIC_CMDLINE.

Signed-off-by: Christophe Leroy <redacted>
---
quoted hunk ↗ jump to hunk
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index e798e55915c2..fab84f62448c 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -16,6 +16,7 @@ config SUPERH
  	select CPU_NO_EFFICIENT_FFS
  	select DMA_DECLARE_COHERENT
  	select GENERIC_ATOMIC64
+	select GENERIC_CMDLINE
  	select GENERIC_CMOS_UPDATE if SH_SH03 || SH_DREAMCAST
  	select GENERIC_IDLE_POLL_SETUP
  	select GENERIC_IRQ_SHOW
@@ -742,35 +743,6 @@ config ROMIMAGE_MMCIF
  	  first part of the romImage which in turn loads the rest the kernel
  	  image to RAM using the MMCIF hardware block.
  
-choice
-	prompt "Kernel command line"
-	optional
-	default CMDLINE_OVERWRITE
-	help
-	  Setting this option allows the kernel command line arguments
-	  to be set.
-
-config CMDLINE_OVERWRITE
-	bool "Overwrite bootloader kernel arguments"
-	help
-	  Given string will overwrite any arguments passed in by
-	  a bootloader.
-
-config CMDLINE_EXTEND
-	bool "Extend bootloader kernel arguments"
-	help
-	  Given string will be concatenated with arguments passed in
-	  by a bootloader.
-
-endchoice
-
-config CMDLINE
-	string "Kernel command line arguments string"
-	depends on CMDLINE_OVERWRITE || CMDLINE_EXTEND
-	default "console=ttySC1,115200"
-
-endmenu
-
That "endmenu" shall not be removed.

Fixed in v4,

Thanks to Rob L. for the report.
Christophe
  menu "Bus options"
  
  config SUPERHYWAY
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help