diff options
| author | Tom Rini <trini@konsulko.com> | 2020-09-19 08:35:20 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-09-19 08:35:20 -0400 |
| commit | 400f84c5baaec9b8a9f30e4ea77785e6f9e00c4b (patch) | |
| tree | a38334e5dd5ea274d84f5cb94e0a043ffcb05545 /lib/efi_loader/efi_memory.c | |
| parent | 667ab37d586e702bc745934afff3dae2f67a2257 (diff) | |
| parent | 8f0ac536d4937d07a95fcc56756c14ef7a94e397 (diff) | |
Merge tag 'efi-2020-10-rc5-2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Pull request for UEFI sub-system for efi-2020-10-rc5 (2)
The following bugs are fixed:
* incorrect online help for setenv and env
* description of function efi_mem_carve_out()
* replace printf() by log_err() in stm32mp1_rng driver
A unit test is provided to check that the boot hart id is provided in the
RISC-V device-tree.
Diffstat (limited to 'lib/efi_loader/efi_memory.c')
| -rw-r--r-- | lib/efi_loader/efi_memory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index 7be756e370..11e755363e 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -235,7 +235,7 @@ static s64 efi_mem_carve_out(struct efi_mem_list *map, * @start: start address, must be a multiple of EFI_PAGE_SIZE * @pages: number of pages to add * @memory_type: type of memory added - * @overlap_only_ram: the memory area must overlap existing + * @overlap_only_ram: region may only overlap RAM * Return: status code */ static efi_status_t efi_add_memory_map_pg(u64 start, u64 pages, |