diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 1d40fe6845e31065eb6c182b5fbbd5fbf73ae5ab..fa32df02fc4af3e3d5fda6b0b3e17684b2d99a26 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 0000000000000000000000000000000000000000..cec8d09cc3f031b57c1f057c8a1f3756b8312861 --- /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 a6048480730cefa8aec29e68c8b0327b1415dddf..4feaa0509aa7b5bd16f285ef886824b88d7330bd 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 d4477c2794948c9f21702976879022437cdeede6..da827aca87e3d8750d4344ea88f3c20e76e7dce5 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 cd47dbca63f150dbfc64bb8c99f9d0ec3b819f62..ef63888bfca62f0633a50e4e2e9c382e5b019f16 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -293,7 +293,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