ARM: tegra: set MMC pin mux in board_init()

[karo-tx-uboot.git] / lib / efi_loader / efi_memory.c

diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c
index df2381e42c2a82764ced80daba124f48142aba31..80e4e26e05ea266f182d545eb6491a4d9f7810d5 100644 (file)
--- a/lib/efi_loader/efi_memory.c
+++ b/lib/efi_loader/efi_memory.c
@@ -130,6 +130,9 @@ uint64_t efi_add_memory_map(uint64_t start, uint64_t pages, int memory_type,
        bool carve_again;
        uint64_t carved_pages = 0;
 
+       debug("%s: 0x%" PRIx64 " 0x%" PRIx64 " %d %s\n", __func__,
+             start, pages, memory_type, overlap_only_ram ? "yes" : "no");
+
        if (!pages)
                return start;
 
@@ -336,6 +339,9 @@ efi_status_t efi_get_memory_map(unsigned long *memory_map_size,
        if (descriptor_size)
                *descriptor_size = sizeof(struct efi_mem_desc);
 
+       if (descriptor_version)
+               *descriptor_version = EFI_MEMORY_DESCRIPTOR_VERSION;
+
        if (*memory_map_size < map_size)
                return EFI_BUFFER_TOO_SMALL;