summaryrefslogtreecommitdiff
path: root/cmd/bootefi.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-05-18 08:17:29 -0400
committerTom Rini <trini@konsulko.com>2020-05-18 08:17:29 -0400
commited9a3aa6452f57af65eb74f73bd2a54c3a2f4b03 (patch)
tree360fcb8e12955e02f8454e5f901d7891cf4168b6 /cmd/bootefi.c
parent515f613253cf0a892c3a321770ab927fa3d925cf (diff)
parent7f44c7e281ef228d60625f5acdcbe68a847256bd (diff)
Merge tag 'efi-2020-07-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Pull request for UEFI sub-system for efi-2020-07-rc3 A series of patches introduces the possibility to manage UEFI variables via an OP-TEE module. CONFIG_EFI_MM_COMM_TEE enables this. If this option is not specified the U-Boot behavior remains unchanged. A defconfig is provided for compile testing (lx2160ardb_tfa_stmm_defconfig). An incorrect UEFI memory allocation for fsl-layerscape is fixed
Diffstat (limited to 'cmd/bootefi.c')
-rw-r--r--cmd/bootefi.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/cmd/bootefi.c b/cmd/bootefi.c
index 06573b14e9b..9849eb4f995 100644
--- a/cmd/bootefi.c
+++ b/cmd/bootefi.c
@@ -151,14 +151,10 @@ done:
static void efi_reserve_memory(u64 addr, u64 size)
{
- u64 pages;
-
/* Convert from sandbox address space. */
addr = (uintptr_t)map_sysmem(addr, 0);
- pages = efi_size_in_pages(size + (addr & EFI_PAGE_MASK));
- addr &= ~EFI_PAGE_MASK;
- if (efi_add_memory_map(addr, pages, EFI_RESERVED_MEMORY_TYPE,
- false) != EFI_SUCCESS)
+ if (efi_add_memory_map(addr, size,
+ EFI_RESERVED_MEMORY_TYPE) != EFI_SUCCESS)
printf("Reserved memory mapping failed addr %llx size %llx\n",
addr, size);
}