diff options
| author | Tom Rini <trini@konsulko.com> | 2024-03-13 20:39:46 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-03-13 20:39:46 -0400 |
| commit | 86fd291a7990af84e96808f48eff2219dd4ef496 (patch) | |
| tree | f29ba244471f50a77436266f7ea84eaf833e0a9f /lib/efi_loader/efi_helper.c | |
| parent | a81242099c56a0680658a3420f2a7ede08db2c14 (diff) | |
| parent | c8a2567475508156f4f43ea2caf3532790d47f8e (diff) | |
Merge tag 'efi-2024-04-rc5' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-2024-04-rc5
Documentation:
* fix Python string escapes
* develop: commands: Fix function prototype
* fix incorrect path Documentation
* fix mistyped "env flags" command
* board: phytec: phycore-am62x: Update artifact names
UEFI:
* Invoke ft_board_setup() before efi_carve_out_dt_rsv()
Diffstat (limited to 'lib/efi_loader/efi_helper.c')
| -rw-r--r-- | lib/efi_loader/efi_helper.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/efi_loader/efi_helper.c b/lib/efi_loader/efi_helper.c index 5dd9cc876e..58761fae78 100644 --- a/lib/efi_loader/efi_helper.c +++ b/lib/efi_loader/efi_helper.c @@ -456,11 +456,11 @@ efi_status_t efi_install_fdt(void *fdt) return EFI_LOAD_ERROR; } - /* Create memory reservations as indicated by the device tree */ - efi_carve_out_dt_rsv(fdt); - - if (CONFIG_IS_ENABLED(GENERATE_ACPI_TABLE)) + if (CONFIG_IS_ENABLED(GENERATE_ACPI_TABLE)) { + /* Create memory reservations as indicated by the device tree */ + efi_carve_out_dt_rsv(fdt); return EFI_SUCCESS; + } /* Prepare device tree for payload */ ret = copy_fdt(&fdt); @@ -474,6 +474,9 @@ efi_status_t efi_install_fdt(void *fdt) return EFI_LOAD_ERROR; } + /* Create memory reservations as indicated by the device tree */ + efi_carve_out_dt_rsv(fdt); + efi_try_purge_kaslr_seed(fdt); if (CONFIG_IS_ENABLED(EFI_TCG2_PROTOCOL_MEASURE_DTB)) { |