Commit d9a1dab6 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

sh: Convert the last use of 'optional' property in Kconfig 



The 'choice' statement is primarily used to exclusively select one
option, but the 'optional' property allows all entries to be disabled.

This feature is rarely used. In fact, it is only used in arch/sh/Kconfig
because the equivalent outcome can be achieved by inserting one more
entry.

The 'optional' property support will be removed from Kconfig.

This commit replaces the 'optional' property with a dummy option,
CMDLINE_FROM_BOOTLOADER, as seen in some other architectures.

Note:
 The 'default CMDLINE_OVERWRITE' statement does not work as intended
 in combination with 'optional'. If neither CONFIG_CMDLINE_OVERWRITE
 nor CONFIG_CMDLINE_EXTEND is specified in a defconfig file, both of
 them are disabled. This is a bug. To maintain the current behavior,
 I added CONFIG_CMDLINE_FROM_BOOTLOADER=y to those defconfig files.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Acked-by: default avatarJohn Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
parent 1da251c6

arch/sh/Kconfig

+5 −1
Original line number Diff line number Diff line
@@ -709,7 +709,6 @@ config ROMIMAGE_MMCIF 


choice

	prompt "Kernel command line"

	optional

	default CMDLINE_OVERWRITE

	help

	  Setting this option allows the kernel command line arguments
@@ -727,6 +726,11 @@ config CMDLINE_EXTEND 
	  Given string will be concatenated with arguments passed in

	  by a bootloader.



config CMDLINE_FROM_BOOTLOADER

	bool "Use bootloader kernel arguments"

	help

	  Uses the command-line options passed by the boot loader.



endchoice



config CMDLINE

arch/sh/configs/apsh4a3a_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ CONFIG_MEMORY_START=0x0C000000 
CONFIG_FLATMEM_MANUAL=y

CONFIG_SH_STORE_QUEUES=y

CONFIG_SH_APSH4A3A=y

CONFIG_CMDLINE_FROM_BOOTLOADER=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_KEXEC=y

CONFIG_PREEMPT=y

arch/sh/configs/apsh4ad0a_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ CONFIG_SECCOMP=y 
CONFIG_PREEMPT=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_BINFMT_MISC=y

CONFIG_CMDLINE_FROM_BOOTLOADER=y

CONFIG_PM=y

CONFIG_PM_DEBUG=y

CONFIG_PM=y

arch/sh/configs/edosk7705_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
CONFIG_CPU_SUBTYPE_SH7705=y

CONFIG_SH_EDOSK7705=y

CONFIG_SH_PCLK_FREQ=31250000

CONFIG_CMDLINE_FROM_BOOTLOADER=y

# CONFIG_PREVENT_FIRMWARE_BUILD is not set

# CONFIG_INPUT is not set

# CONFIG_SERIO is not set

arch/sh/configs/hp6xx_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ CONFIG_SH_DMA_API=y 
CONFIG_HD64461_ENABLER=y

CONFIG_PCCARD=y

CONFIG_PM=y

CONFIG_CMDLINE_FROM_BOOTLOADER=y

CONFIG_APM_EMULATION=y

# CONFIG_STANDALONE is not set

CONFIG_BLK_DEV_SD=y