diff options
| author | Tom Rini <trini@konsulko.com> | 2020-06-30 17:15:39 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-06-30 17:15:39 -0400 |
| commit | bcfe764ee925d0820e82c69ccf75b71d142644c7 (patch) | |
| tree | 8a9914800558194df74705c06160c24f1aa8248e /cmd/bootefi.c | |
| parent | 0b7d95531cf25a7c71bd9855135da5e7098e7b97 (diff) | |
| parent | b7cae5739741fad1327e64c18a0b30919bc77a0e (diff) | |
Merge tag 'efi-2020-07-rc6-2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Pull request for UEFI sub-system for efi-2020-07-rc6 (2)
Fix an incorrect update of the GD register in efi_get_variable_common().
Fix an incorrect check for an FDT reg property.
Fix a device tree used for Python testing.
Diffstat (limited to 'cmd/bootefi.c')
| -rw-r--r-- | cmd/bootefi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/bootefi.c b/cmd/bootefi.c index 8269153973..57552f99fc 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -200,7 +200,7 @@ 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 (fdt_addr != FDT_ADDR_T_NONE && fdtdec_get_is_enabled(fdt, subnode)) efi_reserve_memory(fdt_addr, fdt_size); subnode = fdt_next_subnode(fdt, subnode); |