Convert CONFIG_CMD_ZBOOT to Kconfig

This converts the following to Kconfig:
   CONFIG_CMD_ZBOOT

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>

diff --git a/arch/Kconfig b/arch/Kconfig
index 08f6e7f47d0b5074cc785b36861ea61e4771b454..78532f56ca87d0d90d59a0688e1517ee4ef6ab43 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -113,6 +113,7 @@ config X86
        imply CMD_IO
        imply CMD_IRQ
        imply CMD_SF_TEST
+       imply CMD_ZBOOT
 
 config XTENSA
        bool "Xtensa architecture"

diff --git a/cmd/Kconfig b/cmd/Kconfig
index b80aff94b2ef1ac3461b4a474d58a3fc305512c4..fbedf9895789f52a0bb42c75170565fec247c518 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -312,6 +312,18 @@ config CMD_THOR_DOWNLOAD
          There is no documentation about this within the U-Boot source code
          but you should be able to find something on the interwebs.
 
+config CMD_ZBOOT
+       bool "zboot - x86 boot command"
+       help
+         With x86 machines it is common to boot a bzImage file which
+         contains both a kernel and a setup.bin file. The latter includes
+         configuration information from the dark ages which x86 boards still
+         need to pick things out of.
+
+         Consider using FIT in preference to this since it supports directly
+         booting both 32- and 64-bit kernels, as well as secure boot.
+         Documentation is available in doc/uImage.FIT/x86-fit-boot.txt
+
 endmenu
 
 menu "Environment commands"

diff --git a/include/configs/edison.h b/include/configs/edison.h
index 03aa7023061953373600f4162ecebbd40127caec..dfac340c2f5e042d3d71d5d93b8fb60a6015cc19 100644 (file)
--- a/include/configs/edison.h
+++ b/include/configs/edison.h
@@ -10,7 +10,6 @@
 #include <asm/ibmpc.h>
 
 /* Boot */
-#define CONFIG_CMD_ZBOOT
 #define CONFIG_BOOTCOMMAND "run bootcmd"
 
 /* DISK Partition support */

diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 43af193344b82c2f7579ca6c62392277912bf974..7ff354a4ad5f2dc10e512d6844a4a70352324866 100644 (file)
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -67,8 +67,6 @@
  * Command line configuration.
  */
 
-#define CONFIG_CMD_ZBOOT
-
 #define CONFIG_BOOTARGS                \
        "root=/dev/sdb3 init=/sbin/init rootwait ro"
 #define CONFIG_BOOTCOMMAND     \

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 8b02d2ea726e6db342d371029f6858d2c1c5399d..631a5fa13d0cc992d4abc5bb2c822e2c36f5576a 100644 (file)
--- 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_ZBOOT
 CONFIG_CMD_ZFS
 CONFIG_CM_INIT
 CONFIG_CM_MULTIPLE_SSRAM