This converts the following to Kconfig:
CONFIG_CMD_ZBOOT
Signed-off-by: Simon Glass <s...@chromium.org>
---
arch/Kconfig | 1 +
cmd/Kconfig | 12 ++++++++++++
include/configs/x86-common.h | 2 --
scripts/config_whitelist.txt | 1 -
4 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/arch/Kconfig b/arch/Kconfig
index a3c9b99ea5..4bf4dae288 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -99,6 +99,7 @@ config X86
imply CMD_GETTIME
imply CMD_IO
imply CMD_IRQ
+ imply CMD_ZBOOT
config XTENSA
bool "Xtensa architecture"
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 28a7c9a399..cf3ea47ed0 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -306,6 +306,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/x86-common.h b/include/configs/x86-common.h
index 028eb2e57c..073feb1c50 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -71,8 +71,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 0d7b6fcfc3..25842f6da0 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_ZBOOT
CONFIG_CMD_ZFS
CONFIG_CM_INIT
CONFIG_CM_MULTIPLE_SSRAM
--
2.14.0.rc0.284.gd933b75aa4-goog
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
