[U-Boot] [PATCH 23/41] Convert CONFIG_CMD_SH_ZIMAGEBOOT to Kconfig

[Simon Glass]

This converts the following to Kconfig:
   CONFIG_CMD_SH_ZIMAGEBOOT

Signed-off-by: Simon Glass <sjg at chromium.org>
---

 arch/sh/Kconfig                   | 2 ++
 arch/sh/lib/Kconfig               | 5 +++++
 configs/r2dplus_defconfig         | 1 +
 configs/sh7785lcr_32bit_defconfig | 1 +
 configs/sh7785lcr_defconfig       | 1 +
 include/configs/r2dplus.h         | 1 -
 include/configs/sh7785lcr.h       | 2 --
 scripts/config_whitelist.txt      | 1 -
 8 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 arch/sh/lib/Kconfig

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 6ac22af2f1..d20761e66c 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -125,6 +125,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..5142cb1af2
--- /dev/null
+++ b/arch/sh/lib/Kconfig
@@ -0,0 +1,5 @@
+config CMD_SH_ZIMAGEBOOT
+	bool "Boot a zImage on SH"
+	help
+	  This is special SH-specific command to boot a zImage (compressed
+	  Linux image) on SH-architecture boards.
diff --git a/configs/r2dplus_defconfig b/configs/r2dplus_defconfig
index aaf351d2a1..f6c0592b4b 100644
--- a/configs/r2dplus_defconfig
+++ b/configs/r2dplus_defconfig
@@ -1,5 +1,6 @@
 CONFIG_SH=y
 CONFIG_TARGET_R2DPLUS=y
+CONFIG_CMD_SH_ZIMAGEBOOT=y
 CONFIG_BOOTDELAY=-1
 CONFIG_CMD_IDE=y
 CONFIG_CMD_PCI=y
diff --git a/configs/sh7785lcr_32bit_defconfig b/configs/sh7785lcr_32bit_defconfig
index 1280e588c0..8353a744fb 100644
--- a/configs/sh7785lcr_32bit_defconfig
+++ b/configs/sh7785lcr_32bit_defconfig
@@ -1,6 +1,7 @@
 CONFIG_SH=y
 CONFIG_SH_32BIT=y
 CONFIG_TARGET_SH7785LCR=y
+CONFIG_CMD_SH_ZIMAGEBOOT=y
 CONFIG_BOOTDELAY=3
 CONFIG_VERSION_VARIABLE=y
 # CONFIG_CMD_BDI is not set
diff --git a/configs/sh7785lcr_defconfig b/configs/sh7785lcr_defconfig
index cd9a59b62a..110b2ba15f 100644
--- a/configs/sh7785lcr_defconfig
+++ b/configs/sh7785lcr_defconfig
@@ -1,5 +1,6 @@
 CONFIG_SH=y
 CONFIG_TARGET_SH7785LCR=y
+CONFIG_CMD_SH_ZIMAGEBOOT=y
 CONFIG_BOOTDELAY=3
 CONFIG_VERSION_VARIABLE=y
 # CONFIG_CMD_BDI is not set
diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h
index 19f9088b3d..7fa7932048 100644
--- a/include/configs/r2dplus.h
+++ b/include/configs/r2dplus.h
@@ -11,7 +11,6 @@
 /*
  * Command line configuration.
  */
-#define CONFIG_CMD_SH_ZIMAGEBOOT
 
 /* SCIF */
 #define CONFIG_SCIF_CONSOLE	1
diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h
index b0afc67257..d925aadb8d 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 d6f52068ff..1a39eb41b4 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
-- 
2.14.0.rc0.284.gd933b75aa4-goog