This converts the following to Kconfig: CONFIG_CMD_SH_ZIMAGEBOOT
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v2: - Make this 'default y' and drop defconfig file changes - Remove some now-superfluous /* commands */ comments in header files - Rename the option to include 'zimageboot'
arch/sh/Kconfig | 2 ++ arch/sh/lib/Kconfig | 6 ++++++ include/configs/r2dplus.h | 5 ----- include/configs/sh7785lcr.h | 2 -- scripts/config_whitelist.txt | 1 - 5 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 arch/sh/lib/Kconfig
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 1d40fe6845..fa32df02fc 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -128,6 +128,8 @@ config SYS_CPU default "sh3" if CPU_SH3 default "sh4" if CPU_SH4
+source "arch/sh/lib/Kconfig" + source "board/alphaproject/ap_sh4a_4a/Kconfig" source "board/espt/Kconfig" source "board/mpr2/Kconfig" diff --git a/arch/sh/lib/Kconfig b/arch/sh/lib/Kconfig new file mode 100644 index 0000000000..cec8d09cc3 --- /dev/null +++ b/arch/sh/lib/Kconfig @@ -0,0 +1,6 @@ +config CMD_SH_ZIMAGEBOOT + bool "zimageboot - Boot a zImage on SH" + default y + help + This is special SH-specific command to boot a zImage (compressed + Linux image) on SH-architecture boards. diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h index a604848073..4feaa0509a 100644 --- a/include/configs/r2dplus.h +++ b/include/configs/r2dplus.h @@ -8,11 +8,6 @@
#define CONFIG_DISPLAY_BOARDINFO
-/* - * Command line configuration. - */ -#define CONFIG_CMD_SH_ZIMAGEBOOT - /* SCIF */ #define CONFIG_CONS_SCIF1 1
diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h index d4477c2794..da827aca87 100644 --- a/include/configs/sh7785lcr.h +++ b/include/configs/sh7785lcr.h @@ -12,8 +12,6 @@ #define CONFIG_CPU_SH7785 1 #define CONFIG_SH7785LCR 1
-#define CONFIG_CMD_SH_ZIMAGEBOOT - #define CONFIG_BOOTARGS "console=ttySC1,115200 root=/dev/nfs ip=dhcp"
#define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 3a81c7e3ad..08351b57e1 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_SH_ZIMAGEBOOT CONFIG_CMD_SPL CONFIG_CMD_SPL_NAND_OFS CONFIG_CMD_SPL_WRITE_SIZE