diff options
| author | Tom Rini <trini@konsulko.com> | 2024-01-14 09:34:14 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-01-14 09:34:14 -0500 |
| commit | 817fdce324cac70fb4216ba42976f7b9c2ba9f99 (patch) | |
| tree | b603968cc2de846e26382fd9e52945abf2391526 /lib/efi_loader/efi_bootmgr.c | |
| parent | 547d3dd28a46a18d59e00a153c8becca8d4e8cf9 (diff) | |
| parent | 55125bbfb48cb1330a692059bc972810f77b984a (diff) | |
Merge tag 'efi-2024-04-rc1' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-2024-04-rc1
Documentation:
* update coreboot graphics documentation
* fix '---' rendering
UEFI:
* add missing pointer check after memory allocation in efidebug
* replace duplicate functions efi_dp_append and efi_dp_concat
* support fmp versioning for multi bank update
* avoid using dm_scan_other() in EFI app
Diffstat (limited to 'lib/efi_loader/efi_bootmgr.c')
| -rw-r--r-- | lib/efi_loader/efi_bootmgr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/efi_loader/efi_bootmgr.c b/lib/efi_loader/efi_bootmgr.c index a032d3ae04e..dd2dd23c7b5 100644 --- a/lib/efi_loader/efi_bootmgr.c +++ b/lib/efi_loader/efi_bootmgr.c @@ -143,7 +143,7 @@ static efi_status_t try_load_from_file_path(efi_handle_t *fs_handles, if (!dp) continue; - dp = efi_dp_append(dp, fp); + dp = efi_dp_concat(dp, fp, false); if (!dp) continue; @@ -1579,8 +1579,8 @@ efi_status_t efi_run_image(void *source_buffer, efi_uintn_t source_size) goto out; msg_path = file_path; } else { - file_path = efi_dp_append(bootefi_device_path, - bootefi_image_path); + file_path = efi_dp_concat(bootefi_device_path, + bootefi_image_path, false); msg_path = bootefi_image_path; log_debug("Loaded from disk\n"); } |