diff options
| author | Tom Rini <trini@konsulko.com> | 2020-07-06 01:13:12 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-07-06 01:13:12 +0300 |
| commit | 621e09cb3bf7e6d4fce9dd5e6de97e057adebc3a (patch) | |
| tree | c2fcb855263939c0cf2a19d7c192fb9a74679d3b /cmd | |
| parent | df3d0a3f95dd9109b889c5411204f133451b7a7e (diff) | |
| parent | 93f6201af71d9a0a521c99212e6066778270a357 (diff) | |
| download | u-boot-621e09cb3bf7e6d4fce9dd5e6de97e057adebc3a.tar.xz | |
Merge tag 'efi-2020-10-rc1' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi into next
Pull request for UEFI sub-system for efi-2020-10-rc1
This series comprises error corrections for the UEFI subsystem:
* correct consideration of timestamps for variable authentication
* correct collection of data regions for code authentication
* correct unit tests to test loading dbx
* enable FAT_WRITE as required by the UEFI spec
The boot manager uses log functions instead of printf() and debug().
The UEFI intialization state is exported.
Diffstat (limited to 'cmd')
| -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); |