* [PATCH] efi_loader: do not install dtb if bootmgr fails
@ 2024-04-22 9:16 Heinrich Schuchardt
2024-04-22 9:54 ` Ilias Apalodimas
0 siblings, 1 reply; 2+ messages in thread
From: Heinrich Schuchardt @ 2024-04-22 9:16 UTC (permalink / raw
To: Ilias Apalodimas
Cc: Masahisa Kojima, Raymond Mao, AKASHI Takahiro, u-boot,
Heinrich Schuchardt
If the UEFI boot manager fails, there is no point in installing the
device-tree as a configuration table.
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
---
lib/efi_loader/efi_bootmgr.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/efi_loader/efi_bootmgr.c b/lib/efi_loader/efi_bootmgr.c
index c64cbe82402..2b0d3137338 100644
--- a/lib/efi_loader/efi_bootmgr.c
+++ b/lib/efi_loader/efi_bootmgr.c
@@ -1209,15 +1209,15 @@ efi_status_t efi_bootmgr_run(void *fdt)
return CMD_RET_FAILURE;
}
- ret = efi_install_fdt(fdt);
- if (ret != EFI_SUCCESS)
- return ret;
-
ret = efi_bootmgr_load(&handle, &load_options);
if (ret != EFI_SUCCESS) {
log_notice("EFI boot manager: Cannot load any image\n");
return ret;
}
+ ret = efi_install_fdt(fdt);
+ if (ret != EFI_SUCCESS)
+ return ret;
+
return do_bootefi_exec(handle, load_options);
}
--
2.43.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] efi_loader: do not install dtb if bootmgr fails
2024-04-22 9:16 [PATCH] efi_loader: do not install dtb if bootmgr fails Heinrich Schuchardt
@ 2024-04-22 9:54 ` Ilias Apalodimas
0 siblings, 0 replies; 2+ messages in thread
From: Ilias Apalodimas @ 2024-04-22 9:54 UTC (permalink / raw
To: Heinrich Schuchardt; +Cc: Masahisa Kojima, Raymond Mao, AKASHI Takahiro, u-boot
On Mon, 22 Apr 2024 at 12:16, Heinrich Schuchardt
<heinrich.schuchardt@canonical.com> wrote:
>
> If the UEFI boot manager fails, there is no point in installing the
> device-tree as a configuration table.
>
> Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
> ---
> lib/efi_loader/efi_bootmgr.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/lib/efi_loader/efi_bootmgr.c b/lib/efi_loader/efi_bootmgr.c
> index c64cbe82402..2b0d3137338 100644
> --- a/lib/efi_loader/efi_bootmgr.c
> +++ b/lib/efi_loader/efi_bootmgr.c
> @@ -1209,15 +1209,15 @@ efi_status_t efi_bootmgr_run(void *fdt)
> return CMD_RET_FAILURE;
> }
>
> - ret = efi_install_fdt(fdt);
> - if (ret != EFI_SUCCESS)
> - return ret;
> -
> ret = efi_bootmgr_load(&handle, &load_options);
> if (ret != EFI_SUCCESS) {
> log_notice("EFI boot manager: Cannot load any image\n");
> return ret;
> }
>
> + ret = efi_install_fdt(fdt);
> + if (ret != EFI_SUCCESS)
> + return ret;
> +
> return do_bootefi_exec(handle, load_options);
> }
> --
> 2.43.0
>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-04-22 9:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-22 9:16 [PATCH] efi_loader: do not install dtb if bootmgr fails Heinrich Schuchardt
2024-04-22 9:54 ` Ilias Apalodimas
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.