Thread (3 messages) flat view 3 messages, 2 authors, 2020-06-11

Re: [PATCH v2] powerpc: Remove inaccessible CMDLINE default

From: Christophe Leroy <hidden>
Date: 2020-06-11 05:47:37
Also in: lkml


Le 11/06/2020 à 05:41, Chris Packham a écrit :
Since commit cbe46bd4f510 ("powerpc: remove CONFIG_CMDLINE #ifdef mess")
CONFIG_CMDLINE has always had a value regardless of CONFIG_CMDLINE_BOOL.

For example:

  $ make ARCH=powerpc defconfig
  $ cat .config
  # CONFIG_CMDLINE_BOOL is not set
  CONFIG_CMDLINE=""

When enabling CONFIG_CMDLINE_BOOL this value is kept making the 'default
"..." if CONFIG_CMDLINE_BOOL' ineffective.

  $ ./scripts/config --enable CONFIG_CMDLINE_BOOL
  $ cat .config
  CONFIG_CMDLINE_BOOL=y
  CONFIG_CMDLINE=""

Remove CONFIG_CMDLINE_BOOL and the inaccessible default.
You also have to remove all CONFIG_CMDLINE_BOOL from the defconfigs

Christophe
quoted hunk ↗ jump to hunk
Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
Reviewed-by: Christophe Leroy <redacted>
---
It took me a while to get round to sending a v2, for a refresher v1 can be found here:

http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20190802050232.22978-1-chris.packham@alliedtelesis.co.nz/

Changes in v2:
- Rebase on top of Linus's tree
- Fix some typos in commit message
- Add review from Christophe
- Remove CONFIG_CMDLINE_BOOL

  arch/powerpc/Kconfig | 6 +-----
  1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 9fa23eb320ff..51abc59c3334 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -859,12 +859,8 @@ config PPC_DENORMALISATION
  	  Add support for handling denormalisation of single precision
  	  values.  Useful for bare metal only.  If unsure say Y here.
  
-config CMDLINE_BOOL
-	bool "Default bootloader kernel arguments"
-
  config CMDLINE
-	string "Initial kernel command string" if CMDLINE_BOOL
-	default "console=ttyS0,9600 console=tty0 root=/dev/sda2" if CMDLINE_BOOL
+	string "Initial kernel command string"
  	default ""
  	help
  	  On some platforms, there is currently no way for the boot loader to
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help