aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2023-02-22 14:06:23 -0700
committerTom Rini <trini@konsulko.com>2023-06-03 13:13:58 -0400
commitfd40c35c4fe120a2fcb0761c80823ce9f38e0ee0 (patch)
tree59dcb05089aad45cf6097a819eef00f246d87a9b
parent565ca6c4213c876a6ffe20331442b08ba16bc7eb (diff)
downloadu-boot-CHECK/bootstd-full.zip
u-boot-CHECK/bootstd-full.tar.gz
u-boot-CHECK/bootstd-full.tar.bz2
bootstd: Make BOOTSTD_FULL depend on BOOTSTDCHECK/bootstd-full
Move BOOTSTD_FULL down in the file so that it can be enabled only when BOOTSTD is enabled. This prevents a build error if BOOTSTD is disabled but BOOTSTD_FULL is enabled. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
-rw-r--r--boot/Kconfig26
1 files changed, 13 insertions, 13 deletions
diff --git a/boot/Kconfig b/boot/Kconfig
index 8c27f52..4094ad3 100644
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -397,19 +397,6 @@ config BOOTSTD
U-Boot)
- bootflow - a description of how to boot (owned by the distro)
-config BOOTSTD_FULL
- bool "Enhanced features for standard boot"
- default y if SANDBOX
- help
- This enables various useful features for standard boot, which are not
- essential for operation:
-
- - bootdev, bootmeth commands
- - extra features in the bootflow command
- - support for selecting the ordering of bootmeths ("bootmeth order")
- - support for selecting the ordering of bootdevs using the devicetree
- as well as the "boot_targets" environment variable
-
config SPL_BOOTSTD
bool "Standard boot support in SPL"
depends on SPL && SPL_DM && SPL_OF_CONTROL && SPL_BLK
@@ -432,6 +419,19 @@ config VPL_BOOTSTD
if BOOTSTD
+config BOOTSTD_FULL
+ bool "Enhanced features for standard boot"
+ default y if SANDBOX
+ help
+ This enables various useful features for standard boot, which are not
+ essential for operation:
+
+ - bootdev, bootmeth commands
+ - extra features in the bootflow command
+ - support for selecting the ordering of bootmeths ("bootmeth order")
+ - support for selecting the ordering of bootdevs using the devicetree
+ as well as the "boot_targets" environment variable
+
config BOOTSTD_DEFAULTS
bool "Select some common defaults for standard boot"
depends on BOOTSTD