diff options
| author | Tom Rini <trini@konsulko.com> | 2025-04-11 09:09:08 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-04-11 09:09:08 -0600 |
| commit | dea298c62e904dd697e7b91bd3dae5d839f31d8f (patch) | |
| tree | 796cb253e7511a277c0b54e1c3fb87306a56f353 /common/board_r.c | |
| parent | 048266be426865282e8a482fe1f25bb919a9bfb8 (diff) | |
| parent | a73b854700abcf680379497c32b92aa39fed6270 (diff) | |
Merge tag 'efi-2025-07-rc1' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-2025-07-rc1
CI:
* https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/25648
Documentation:
* Update authenticated capsules documentation
UEFI:
* Add support for loading FIT images including initrd
- efi_loader: efi_load_initrd: provide a memory mapped initrd
- efi_loader: binary_run: register an initrd
- bootm: add support for initrd in do_bootm_efi
* efi_selftest: remove un-needed NULL checks
* efi: Fix efiboot for payloads loaded from memory
* Print extra information from the bootmgr
* Move public cert for capsules to .rodata
* Set EFI capsule dfu_alt_info env explicitly
* Make FDT extra space configurable
* Install the ACPI table from the bloblist
* Handle GD_FLG_SKIP_RELOC
* Handle malloc() errors
Others:
* acpi: select CONFIG_BLOBLIST
* smbios: select CONFIG_BLOBLIST
* xilinx: dfu: Fill directly update_info.dfu_string
* cmd: fwu: Dump custom fields from mdata structure
* board: remove capsule update support in set_dfu_alt_info()
Diffstat (limited to 'common/board_r.c')
| -rw-r--r-- | common/board_r.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/common/board_r.c b/common/board_r.c index 8d69db1875d..f12e0c848e7 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -169,7 +169,8 @@ static int initr_reloc_global_data(void) */ efi_save_gd(); - efi_runtime_relocate(gd->relocaddr, NULL); + if (!(gd->flags & GD_FLG_SKIP_RELOC)) + efi_runtime_relocate(gd->relocaddr, NULL); #endif /* |