mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-24 21:54:01 +00:00
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>
This commit is contained in:
parent
1aa4e8d0de
commit
e7a815f32e
5 changed files with 13 additions and 4 deletions
|
@ -113,6 +113,7 @@ config X86
|
|||
imply CMD_IO
|
||||
imply CMD_IRQ
|
||||
imply CMD_SF_TEST
|
||||
imply CMD_ZBOOT
|
||||
|
||||
config XTENSA
|
||||
bool "Xtensa architecture"
|
||||
|
|
12
cmd/Kconfig
12
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"
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
#include <asm/ibmpc.h>
|
||||
|
||||
/* Boot */
|
||||
#define CONFIG_CMD_ZBOOT
|
||||
#define CONFIG_BOOTCOMMAND "run bootcmd"
|
||||
|
||||
/* DISK Partition support */
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue