diff options
| author | Tom Rini <trini@konsulko.com> | 2024-05-01 19:39:45 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-05-01 19:39:45 -0600 |
| commit | 3132b7982af501f7f62f7b2c7f89d00205de33d1 (patch) | |
| tree | cd5b5ae2fd542e757e052f7beb6407bbf07ed8b5 /lib/efi_loader/efi_helper.c | |
| parent | ff0de1f0557ed7d2dab47ba976a37347a1fdc432 (diff) | |
| parent | 8745f13fe102968f58a9e2e5f69ad153a675b59c (diff) | |
Merge tag 'efi-2024-07-rc2' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-2024-07-rc2
Documentation:
* correct description of 'env print -e'
UEFI:
* remove superfluous efi_restore_gd after EFI_CALL
* terminate efidebug test bootmgr early on error
* do not install device-tree if bootmgr fails
* pass GUID by address to efi_dp_from_lo
* remove dead code in efi_var_mem_init()
* enable QueryVariableInfo at runtime for file backed variables
Diffstat (limited to 'lib/efi_loader/efi_helper.c')
| -rw-r--r-- | lib/efi_loader/efi_helper.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/efi_loader/efi_helper.c b/lib/efi_loader/efi_helper.c index 6918fd5e48a..73d0279e843 100644 --- a/lib/efi_loader/efi_helper.c +++ b/lib/efi_loader/efi_helper.c @@ -72,7 +72,7 @@ out: * * Return: device path or NULL. Caller must free the returned value */ -struct efi_device_path *efi_get_dp_from_boot(const efi_guid_t guid) +struct efi_device_path *efi_get_dp_from_boot(const efi_guid_t *guid) { struct efi_load_option lo; void *var_value; @@ -92,7 +92,7 @@ struct efi_device_path *efi_get_dp_from_boot(const efi_guid_t guid) if (ret != EFI_SUCCESS) goto err; - return efi_dp_from_lo(&lo, &guid); + return efi_dp_from_lo(&lo, guid); err: free(var_value); @@ -544,8 +544,6 @@ efi_status_t do_bootefi_exec(efi_handle_t handle, void *load_options) } } - efi_restore_gd(); - out: free(load_options); |