Create new SPL options so that standard boot can be excluded for SPL. Correct a 'VPL' typo while we are here.
Signed-off-by: Simon Glass <[email protected]> --- Changes in v3: - Correct 'VPL' typo - Use a consistent format for the comment boot/Kconfig | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/boot/Kconfig b/boot/Kconfig index 372be65e534..83c821e38be 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -354,6 +354,9 @@ config PXE_UTILS help Utilities for parsing PXE file formats. +config SPL_PXE_UTILS + def_bool n # Utilities for parsing PXE file formats (SPL) + config BOOTSTD bool "Standard boot support" default y @@ -389,7 +392,7 @@ config BOOTSTD_FULL as well as the "boot_targets" environment variable config SPL_BOOTSTD - bool "Standard boot support in VPL" + bool "Standard boot support in SPL" depends on SPL && SPL_DM && SPL_OF_CONTROL && SPL_BLK default y if VPL help @@ -472,6 +475,9 @@ config BOOTMETH_DISTRO This provides a way to try out standard boot on an existing boot flow. +config SPL_BOOTMETH_DISTRO + def_bool n # Bootdev support for distro boot (SPL) + config BOOTMETH_DISTRO_PXE bool "Bootdev support for distro boot over network" depends on CMD_PXE && CMD_NET && DM_ETH @@ -482,6 +488,9 @@ config BOOTMETH_DISTRO_PXE This provides a way to try out standard boot on an existing boot flow. +config SPL_BOOTMETH_DISTRO_PXE + def_bool n # Bootdev support for distro boot over network (SPL) + config BOOTMETH_EFILOADER bool "Bootdev support for EFI boot" depends on CMD_BOOTEFI @@ -503,6 +512,9 @@ config BOOTMETH_EFILOADER This provides a way to try out standard boot on an existing boot flow. +config SPL_BOOTMETH_EFILOADER + def_bool n # Bootdev support for EFI boot (SPL) + config BOOTMETH_VBE bool "Bootdev support for Verified Boot for Embedded" depends on FIT @@ -566,6 +578,9 @@ config BOOTMETH_VBE_SIMPLE_OS for booting into the OS. This option is only enabled for U-Boot proper, since it is the phase where device tree fixups happen. +config SPL_BOOTMETH_VBE_SIMPLE_OS + def_bool n # Bootdev support for VBE 'simple' method OS phase (SPL) + config SPL_BOOTMETH_VBE_SIMPLE bool "Bootdev support for VBE 'simple' method (SPL)" depends on SPL @@ -627,6 +642,10 @@ config BOOTMETH_SANDBOX This is a sandbox bootmeth driver used for testing. It always returns -ENOTSUPP when attempting to boot. +config SPL_BOOTMETH_SANDBOX + def_bool n # sandbox bootmeth driver used for testing (SPL) + depends on SANDBOX + config BOOTMETH_SCRIPT bool "Bootdev support for U-Boot scripts" default y if BOOTSTD_FULL @@ -638,6 +657,9 @@ config BOOTMETH_SCRIPT This provides a way to try out standard boot on an existing boot flow. It is not enabled by default to save space. +config SPL_BOOTMETH_SCRIPT + def_bool n # Bootdev support for U-Boot scripts (SPL) + endif config LEGACY_IMAGE_FORMAT -- 2.39.1.581.gbfd45094c4-goog
