| Message ID | 20200611034140.9133-1-chris.packham@alliedtelesis.co.nz (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | [v2] powerpc: Remove inaccessible CMDLINE default | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch powerpc/merge (ec7b8eb9bc7a519047485c95f7292b48f5b73fe6) |
| snowpatch_ozlabs/build-ppc64le | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64be | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64e | success | Build succeeded |
| snowpatch_ozlabs/build-pmac32 | success | Build succeeded |
| snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 13 lines checked |
| snowpatch_ozlabs/needsstable | success | Patch has no Fixes tags |
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 > > Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz> > Reviewed-by: Christophe Leroy <christophe.leroy@c-s.fr> > --- > 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 >
On 11/06/20 5:46 pm, Christophe Leroy wrote: > > > 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 OK. I'll do so as a follow-up patch and send a v3. > > Christophe > >> >> Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz> >> Reviewed-by: Christophe Leroy <christophe.leroy@c-s.fr> >> --- >> 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 >>
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
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. Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz> Reviewed-by: Christophe Leroy <christophe.leroy@c-s.fr> --- 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(-)