diff options
| author | Tom Rini <trini@konsulko.com> | 2021-01-14 08:50:23 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-01-14 08:50:23 -0500 |
| commit | 35772ff4f63a302e0b873096372c70292fb0af79 (patch) | |
| tree | ffa00f958cf61d12a9348b27699e3980f9d9f15d /lib/efi_loader/efi_memory.c | |
| parent | ab1a425524a79eeca61e7b67fdf382c7a499346f (diff) | |
| parent | 8e70f1cb3f2c18d574b087d4fc1d79e68ce98fa9 (diff) | |
Merge tag 'efi-2021-04-rc1' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Pull request for UEFI sub-system for efi-2021-04-rc1
In the UEFI sub-system:
* implement non-blocking file services
* print boot device and file path in helloworld.efi
* improve detection of boot device
* correct argument handling in efivar.py
* implement EFI_DT_FIXUP_PROTOCOL
Bug fixes:
* adjust conitrace command for low baud rates
* check that FIT images are valid FDTs
Diffstat (limited to 'lib/efi_loader/efi_memory.c')
| -rw-r--r-- | lib/efi_loader/efi_memory.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index 11e755363e..a3106aba7f 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -541,8 +541,6 @@ efi_status_t efi_free_pages(uint64_t memory, efi_uintn_t pages) ret = efi_add_memory_map_pg(memory, pages, EFI_CONVENTIONAL_MEMORY, false); - /* Merging of adjacent free regions is missing */ - if (ret != EFI_SUCCESS) return EFI_NOT_FOUND; |