diff options
| author | Simon Glass <sjg@chromium.org> | 2023-12-03 17:29:28 -0700 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-04-10 13:49:15 -0600 |
| commit | 80d4c987576070082ed27da88aed732d42396135 (patch) | |
| tree | eb8588681366d2f5f93595f47abb745b90779fac /arch/x86 | |
| parent | bade0ac04b96d92642b3d433734cde2f00ab7fc5 (diff) | |
| download | u-boot-80d4c987576070082ed27da88aed732d42396135.zip u-boot-80d4c987576070082ed27da88aed732d42396135.tar.gz u-boot-80d4c987576070082ed27da88aed732d42396135.tar.bz2 | |
x86: zboot: Create a separate ZBOOT option for zboot logic
Most of the functionality of zboot is contained in the logic which
handles a zimage. Create a separate Kconfig for the logic so that it can
(later) be used without the command itself being enabled.
Enable ZBOOT by default on x86, with the command depending on that. The
existing 'imply' can therefore be removed.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/Kconfig | 8 | ||||
| -rw-r--r-- | arch/x86/lib/Makefile | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 99e59d9..e5ee10a 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1053,4 +1053,12 @@ config SPL_COREBOOT_SYSINFO display, memory and build information. It is stored in struct sysinfo_t after parsing by get_coreboot_info(). +config ZBOOT + bool "Support the zImage format" + default y + help + Enable this to support booting the x86-specific zImage format. This + uses a special, binary format containing information about the Linux + format to boot. + endmenu diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile index 90a7618..8fc35e1 100644 --- a/arch/x86/lib/Makefile +++ b/arch/x86/lib/Makefile @@ -48,7 +48,7 @@ obj-$(CONFIG_$(SPL_TPL_)GENERATE_ACPI_TABLE) += acpi_table.o endif obj-y += tables.o ifndef CONFIG_SPL_BUILD -obj-$(CONFIG_CMD_ZBOOT) += zimage.o +obj-$(CONFIG_ZBOOT) += zimage.o endif obj-$(CONFIG_USE_HOB) += hob.o ifndef CONFIG_TPL_BUILD |