diff options
| author | Tom Rini <trini@konsulko.com> | 2024-06-11 07:42:55 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-06-11 07:42:55 -0600 |
| commit | 9cf83a7da95b70a37d0d2aba79439dc8a2944fe3 (patch) | |
| tree | 31681d2bbebaa2e40b32fb4a35034b6e683d8410 /lib/efi_loader/efi_boottime.c | |
| parent | f9886bc60f42d5bcfcfa4e474af7dc230400b6be (diff) | |
| parent | 535321c2ea76de44896330040d2e43aa4645d026 (diff) | |
Merge tag 'efi-next-20240611' of https://source.denx.de/u-boot/custodians/u-boot-efi into next
Pull request efi-next-20240611
UEFI:
* Allow specifying a device-tree in an EFI load option
using the efidebug or eficonfig command.
* Let the EFI boot manager fall back to an OS provided device-tree
if no device-tree is specified.
Diffstat (limited to 'lib/efi_loader/efi_boottime.c')
| -rw-r--r-- | lib/efi_loader/efi_boottime.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 1951291747c..eedc5f39549 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -1816,7 +1816,7 @@ efi_status_t efi_setup_loaded_image(struct efi_device_path *device_path, if (device_path) { info->device_handle = efi_dp_find_obj(device_path, NULL, NULL); - dp = efi_dp_concat(device_path, file_path, false); + dp = efi_dp_concat(device_path, file_path, 0); if (!dp) { ret = EFI_OUT_OF_RESOURCES; goto failure; @@ -1996,7 +1996,6 @@ error: * @size: size of the loaded image * Return: status code */ -static efi_status_t efi_load_image_from_path(bool boot_policy, struct efi_device_path *file_path, void **buffer, efi_uintn_t *size) |