summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/Kconfig1
-rw-r--r--cmd/Kconfig12
-rw-r--r--include/configs/edison.h1
-rw-r--r--include/configs/x86-common.h2
-rw-r--r--scripts/config_whitelist.txt1
5 files changed, 13 insertions, 4 deletions
diff --git a/arch/Kconfig b/arch/Kconfig
index 08f6e7f47d..78532f56ca 100644
--- 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 b80aff94b2..fbedf98957 100644
--- 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 03aa702306..dfac340c2f 100644
--- 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 43af193344..7ff354a4ad 100644
--- 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 8b02d2ea72..631a5fa13d 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_ZBOOT
CONFIG_CMD_ZFS
CONFIG_CM_INIT
CONFIG_CM_MULTIPLE_SSRAM