[PATCH] boot: vbe: Make BOOTMETH_VBE_xxx a choice

[Simon Glass]

Hi Tom,

On Wed, 1 Oct 2025 at 14:33, Tom Rini <trini at konsulko.com> wrote:
>
> It is not valid to enable multiple BOOTMETH_VBE_xxx methods

Why is it not valid? That wasn't my intention.

> , so make it
> a choice as to which will be enabled, and make the default choice be the
> current default.
>
> Signed-off-by: Tom Rini <trini at konsulko.com>
> ---
>  boot/Kconfig | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/boot/Kconfig b/boot/Kconfig
> index eff05948b3a1..f21a67b2d3ee 100644
> --- a/boot/Kconfig
> +++ b/boot/Kconfig
> @@ -712,9 +712,12 @@ config SPL_BOOTMETH_VBE_REQUEST
>
>           This is only useful if you are booting an OS direct from SPL.
>
> +choice
> +       prompt "Method for VBE to find the correct bootdev"
> +       default BOOTMETH_VBE_SIMPLE
> +
>  config BOOTMETH_VBE_SIMPLE
>         bool "Bootdev support for VBE 'simple' method"
> -       default y
>         imply SPL_CRC8 if SPL
>         imply VPL_CRC8 if VPL
>         help
> @@ -734,6 +737,8 @@ config BOOTMETH_VBE_ABREC
>           verification step, a recovery image is booted. This method will
>           eventually provide rollback protection as well.
>
> +endchoice
> +
>  if BOOTMETH_VBE_SIMPLE
>
>  config BOOTMETH_VBE_SIMPLE_OS
> --
> 2.43.0
>

Regards,
Simon