Merge branch '2020-06-15-misc-bugfixes'

[oweals/u-boot.git] / cmd / bootefi.c

diff --git a/cmd/bootefi.c b/cmd/bootefi.c
index 06573b14e9bf113c0d1070c5432b27a7793ad5f1..0f6d0f77507ca2b0e577814a830dc4a5b813bce0 100644 (file)
--- a/cmd/bootefi.c
+++ b/cmd/bootefi.c
@@ -13,6 +13,7 @@
 #include <efi_selftest.h>
 #include <env.h>
 #include <errno.h>
+#include <image.h>
 #include <malloc.h>
 #include <linux/libfdt.h>
 #include <linux/libfdt_env.h>
@@ -151,14 +152,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);
 }
@@ -598,7 +595,8 @@ static int do_efi_selftest(void)
  * @argv:      command line arguments
  * Return:     status code
  */
-static int do_bootefi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_bootefi(struct cmd_tbl *cmdtp, int flag, int argc,
+                     char *const argv[])
 {
        efi_status_t ret;
        void *fdt;