diff options
| author | Tom Rini <trini@konsulko.com> | 2024-04-20 08:19:20 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-04-20 08:19:20 -0600 |
| commit | b064bb66a10c850e231c7a124b90c8a26f99bd88 (patch) | |
| tree | 05e88b4e7c30aba16e152762a23f1aa802ed604a /lib/efi_loader/efi_helper.c | |
| parent | af04f37a78c7e61597fb9ed6db2c8f8d7f8b0f92 (diff) | |
| parent | 52c62acc349a0ec1ba26ae497913ad34ee3de733 (diff) | |
Merge tag 'efi-2024-07-rc1-3' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-2024-07-rc1-3
Documentation:
* sort env sub-commands alphabetically
* update list of aliases for the env command
UEFI:
* allow enabling SetVariable at runtime
for future OS supported writing to ubootefi.var
* use event callback for initrd deregistration
Others:
* correct alignment of x86 firmware tables
Diffstat (limited to 'lib/efi_loader/efi_helper.c')
| -rw-r--r-- | lib/efi_loader/efi_helper.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/lib/efi_loader/efi_helper.c b/lib/efi_loader/efi_helper.c index 58761fae784..6918fd5e48a 100644 --- a/lib/efi_loader/efi_helper.c +++ b/lib/efi_loader/efi_helper.c @@ -549,11 +549,6 @@ efi_status_t do_bootefi_exec(efi_handle_t handle, void *load_options) out: free(load_options); - if (IS_ENABLED(CONFIG_EFI_LOAD_FILE2_INITRD)) { - if (efi_initrd_deregister() != EFI_SUCCESS) - log_err("Failed to remove loadfile2 for initrd\n"); - } - /* Notify EFI_EVENT_GROUP_RETURN_TO_EFIBOOTMGR event group. */ list_for_each_entry(evt, &efi_events, link) { if (evt->group && |