[PATCH] bootstd: Make efi_mgr bootmeth work for non-sandbox setups

Heinrich Schuchardt xypron.glpk at gmx.de
Fri Jul 14 23:38:21 CEST 2023


On 7/14/23 21:56, Mark Kettenis wrote:
> Enable the bootflow based on this bootmeth if the BootOrder EFI
> variable is set.
>
> Signed-off-by: Mark Kettenis <kettenis at openbsd.org>
> ---
>   boot/bootmeth_efi_mgr.c | 12 +++++++++++-
>   1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/boot/bootmeth_efi_mgr.c b/boot/bootmeth_efi_mgr.c
> index e9d973429f..db650861ff 100644
> --- a/boot/bootmeth_efi_mgr.c
> +++ b/boot/bootmeth_efi_mgr.c
> @@ -14,6 +14,8 @@
>   #include <bootmeth.h>
>   #include <command.h>
>   #include <dm.h>
> +#include <efi_loader.h>
> +#include <efi_variable.h>
>
>   /**
>    * struct efi_mgr_priv - private info for the efi-mgr driver
> @@ -46,13 +48,21 @@ static int efi_mgr_check(struct udevice *dev, struct bootflow_iter *iter)
>   static int efi_mgr_read_bootflow(struct udevice *dev, struct bootflow *bflow)
>   {
>   	struct efi_mgr_priv *priv = dev_get_priv(dev);
> +	efi_uintn_t size;
> +	u16 *bootorder;
>
>   	if (priv->fake_dev) {
>   		bflow->state = BOOTFLOWST_READY;
>   		return 0;
>   	}
>
> -	/* To be implemented */
> +	/* Enable this method if the "BootOrder" UEFI exists. */
> +	bootorder = efi_get_var(u"BootOrder", &efi_global_variable_guid,
> +				&size);
> +	if (bootorder) {
> +		bflow->state = BOOTFLOWST_READY;
> +		return 0;
> +	}
>
>   	return -EINVAL;
>   }

There is no device-tree with compatible "u-boot,efi-bootmgr". So this
looks like dead code up to now. Please, provide a unit test.

@Simon
Where is the documentation that describes the "u-boot,distro-efi" and
"u-boot,efi-bootmgr" boot methods? Current
doc/device-tree-bindings/bootmeth.txt is not sufficient and not included
in the generated online documentation.

doc/device-tree-bindings/bootmeth.txt should be converted to yaml format
so that it can be used for validation of device-trees.

Best regards

Heinrich


More information about the U-Boot mailing list