diff options
| author | Tom Rini <trini@konsulko.com> | 2022-04-23 18:42:00 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-04-23 18:42:00 -0400 |
| commit | 46a06ed82a81dfcb451fe82381c59c1d0a6667a1 (patch) | |
| tree | a4b23b20380a7850521338c5dfe5a5ab6ae47d09 /common/main.c | |
| parent | 9bb99fa95826d1a608737ca821977b4136a1a278 (diff) | |
| parent | d97e98c887ed8fa4a339350c02f093f03cd1cf4d (diff) | |
Merge tag 'efi-2022-07-rc1-3' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request for efi-2022-07-rc1-3
Documentation:
* Document image size parameter of bootefi command
UEFI:
* avoid building partition support in SPL/TPL where not required
* improve integration of EFI subsystem and driver model
* restore ability to boot arbitrary blob
Diffstat (limited to 'common/main.c')
| -rw-r--r-- | common/main.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/common/main.c b/common/main.c index 3f5214fd44b..682f3359ea3 100644 --- a/common/main.c +++ b/common/main.c @@ -54,8 +54,11 @@ void main_loop(void) if (IS_ENABLED(CONFIG_UPDATE_TFTP)) update_tftp(0UL, NULL, NULL); - if (IS_ENABLED(CONFIG_EFI_CAPSULE_ON_DISK_EARLY)) - efi_launch_capsules(); + if (IS_ENABLED(CONFIG_EFI_CAPSULE_ON_DISK_EARLY)) { + /* efi_init_early() already called */ + if (efi_init_obj_list() == EFI_SUCCESS) + efi_launch_capsules(); + } s = bootdelay_process(); if (cli_process_fdt(&s)) |