Merge branch 'next' of git://git.denx.de/u-boot-sh

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

diff --git a/cmd/efi.c b/cmd/efi.c
index 2511c6cb78a0f188572071ced1b323832ccec5d9..ea239a01f0b1c38e187b22d57a6f7695d36881ef 100644 (file)
--- a/cmd/efi.c
+++ b/cmd/efi.c
@@ -9,6 +9,7 @@
 #include <efi.h>
 #include <errno.h>
 #include <malloc.h>
+#include <sort.h>
 
 static const char *const type_name[] = {
        "reserved",
@@ -28,18 +29,21 @@ static const char *const type_name[] = {
 };
 
 static struct attr_info {
-       int shift;
+       u64 val;
        const char *name;
 } mem_attr[] = {
-       { EFI_MEMORY_UC_SHIFT, "uncached" },
-       { EFI_MEMORY_WC_SHIFT, "write-coalescing" },
-       { EFI_MEMORY_WT_SHIFT, "write-through" },
-       { EFI_MEMORY_WB_SHIFT, "write-back" },
-       { EFI_MEMORY_UCE_SHIFT, "uncached & exported" },
-       { EFI_MEMORY_WP_SHIFT, "write-protect" },
-       { EFI_MEMORY_RP_SHIFT, "read-protect" },
-       { EFI_MEMORY_XP_SHIFT, "execute-protect" },
-       { EFI_MEMORY_RUNTIME_SHIFT, "needs runtime mapping" }
+       { EFI_MEMORY_UC, "uncached" },
+       { EFI_MEMORY_WC, "write-coalescing" },
+       { EFI_MEMORY_WT, "write-through" },
+       { EFI_MEMORY_WB, "write-back" },
+       { EFI_MEMORY_UCE, "uncached & exported" },
+       { EFI_MEMORY_WP, "write-protect" },
+       { EFI_MEMORY_RP, "read-protect" },
+       { EFI_MEMORY_XP, "execute-protect" },
+       { EFI_MEMORY_NV, "non-volatile" },
+       { EFI_MEMORY_MORE_RELIABLE, "higher reliability" },
+       { EFI_MEMORY_RO, "read-only" },
+       { EFI_MEMORY_RUNTIME, "needs runtime mapping" }
 };
 
 /* Maximum different attribute values we can track */
@@ -83,7 +87,7 @@ void *efi_build_mem_table(struct efi_entry_memmap *map, int size, bool skip_bs)
        prev = NULL;
        addr = 0;
        dest = base;
-       end = base + count;
+       end = (struct efi_mem_desc *)((ulong)base + count * map->desc_size);
        for (desc = base; desc < end; desc = efi_get_next_mem_desc(map, desc)) {
                bool merge = true;
                int type = desc->type;
@@ -170,10 +174,10 @@ static void efi_print_mem_table(struct efi_entry_memmap *map,
                bool first;
                int j;
 
-               printf("%c%llx: ", attr & EFI_MEMORY_RUNTIME ? 'r' : ' ',
+               printf("%c%llx: ", (attr & EFI_MEMORY_RUNTIME) ? 'r' : ' ',
                       attr & ~EFI_MEMORY_RUNTIME);
                for (j = 0, first = true; j < ARRAY_SIZE(mem_attr); j++) {
-                       if (attr & (1ULL << mem_attr[j].shift)) {
+                       if (attr & mem_attr[j].val) {
                                if (first)
                                        first = false;
                                else