diff options
| author | Simon Glass | 2017-08-04 16:34:47 -0600 |
|---|---|---|
| committer | Tom Rini | 2017-08-11 15:41:57 -0400 |
| commit | 2a728f3a1e3fd6f0483af822d5063766a3344ef2 (patch) | |
| tree | 5047ff420e7896669507898f62049e4999acbbe6 | |
| parent | 719d36ee36db92221e86b37edd1f7b922bde4f9d (diff) | |
Convert CONFIG_CMD_SH_ZIMAGEBOOT to Kconfig
This converts the following to Kconfig:
CONFIG_CMD_SH_ZIMAGEBOOT
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
| -rw-r--r-- | arch/sh/Kconfig | 2 | ||||
| -rw-r--r-- | arch/sh/lib/Kconfig | 6 | ||||
| -rw-r--r-- | include/configs/r2dplus.h | 5 | ||||
| -rw-r--r-- | include/configs/sh7785lcr.h | 2 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
5 files changed, 8 insertions, 8 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 1d40fe6845e..fa32df02fc4 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 00000000000..cec8d09cc3f --- /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 a6048480730..4feaa0509aa 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 d4477c27949..da827aca87e 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 cd47dbca63f..ef63888bfca 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 |