On Wed, 22 Feb 2023 at 23:06, Simon Glass <[email protected]> wrote: > > 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 <[email protected]> > --- > > boot/Kconfig | 26 +++++++++++++------------- > 1 file changed, 13 insertions(+), 13 deletions(-) > > diff --git a/boot/Kconfig b/boot/Kconfig > index 5f491625c82..47952bbba23 100644 > --- a/boot/Kconfig > +++ b/boot/Kconfig > @@ -371,19 +371,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 VPL" > depends on SPL && SPL_DM && SPL_OF_CONTROL && SPL_BLK > @@ -406,6 +393,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 > -- > 2.39.2.637.g21b0678d19-goog >
Reviewed-by: Ilias Apalodimas <[email protected]>
