diff options
| author | Tom Rini <trini@konsulko.com> | 2025-05-01 10:48:24 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-05-01 10:48:24 -0600 |
| commit | 152fa1b7fd6b43c727e322aec7a870a33865a248 (patch) | |
| tree | b5ad2c1af26bd0e106c96c5d717178e757ccdcf1 /lib/efi_loader/efi_bootbin.c | |
| parent | 98a898e58499c78245e4fe36ee404b1b1208e32b (diff) | |
| parent | c0546426724099d94a497ea11ad79862daf37767 (diff) | |
Merge tag 'efi-2025-07-rc2' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-2025-07-rc2
CI:
* https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/26025
Documentation:
* ti: update bash code-block directives to prompt
* ti: k3: add language for code-block directive
* correct uthread inline documentation
UEFI:
* correctly handle EFI FIT images without initrd
* pass kernel load address not entry point for EFI FIT images
Other:
* boot:let BOOTSTAGE_RECORD_COUNT default to 50
Diffstat (limited to 'lib/efi_loader/efi_bootbin.c')
| -rw-r--r-- | lib/efi_loader/efi_bootbin.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/lib/efi_loader/efi_bootbin.c b/lib/efi_loader/efi_bootbin.c index d0f7da309ce..94ba7c5589b 100644 --- a/lib/efi_loader/efi_bootbin.c +++ b/lib/efi_loader/efi_bootbin.c @@ -215,12 +215,11 @@ out: * Return: status code */ static efi_status_t efi_binary_run_dp(void *image, size_t size, void *fdt, - void *initrd, size_t initd_sz, + void *initrd, size_t initrd_sz, struct efi_device_path *dp_dev, struct efi_device_path *dp_img) { efi_status_t ret; - struct efi_device_path *dp_initrd; /* Initialize EFI drivers */ ret = efi_init_obj_list(); @@ -234,11 +233,7 @@ static efi_status_t efi_binary_run_dp(void *image, size_t size, void *fdt, if (ret != EFI_SUCCESS) return ret; - dp_initrd = efi_dp_from_mem(EFI_LOADER_DATA, (uintptr_t)initrd, initd_sz); - if (!dp_initrd) - return EFI_OUT_OF_RESOURCES; - - ret = efi_initrd_register(dp_initrd); + ret = efi_install_initrd(initrd, initrd_sz); if (ret != EFI_SUCCESS) return ret; |