diff options
| author | Tom Rini <trini@konsulko.com> | 2020-03-31 10:05:57 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-03-31 10:05:57 -0400 |
| commit | 1104dde6e89f3d3ab07284e7c871cc33037f1198 (patch) | |
| tree | c7ce7355e30a785007038924b68e7f8870b574fb /cmd/bootefi.c | |
| parent | d1048a60cf874deb6cabc44f6abb4b8d71305e09 (diff) | |
| parent | 67357553ad59eb9b4f412412252e02868ceb16dc (diff) | |
Merge tag 'efi-2020-04-rc5' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Pull request for UEFI sub-system for efi-2020-04-rc5
This series fixes:
* UEFI Python tests CONFIG_OF_CONTROL=y.
* int to pointer cast warning for cmd/efidebug.c
* memory reservation even if fdt node is disabled
Now that the Python test is fixed reintroduce the reverted patch for
vexpress_ca9x4 to enable EFI_LOADER and define the dtb file name.
Diffstat (limited to 'cmd/bootefi.c')
| -rw-r--r-- | cmd/bootefi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd/bootefi.c b/cmd/bootefi.c index 3bbe2d6a1a4..aaed5755059 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -199,7 +199,8 @@ static void efi_carve_out_dt_rsv(void *fdt) * The /reserved-memory node may have children with * a size instead of a reg property. */ - if (addr != FDT_ADDR_T_NONE) + if (addr != FDT_ADDR_T_NONE && + fdtdec_get_is_enabled(fdt, subnode)) efi_reserve_memory(addr, size); subnode = fdt_next_subnode(fdt, subnode); } |