From: Simon Glass <sjg@chromium.org> Before booting using extlinux we must add the memory map to the FDT. Provide a ft_system_setup() function to handle this. To determine the memory size, scan the memory map looking for entries that look like real memory. Signed-off-by: Simon Glass <sjg@chromium.org> --- (no changes since v1) configs/efi-arm_app64_defconfig | 1 + lib/efi_client/efi_app.c | 47 +++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/configs/efi-arm_app64_defconfig b/configs/efi-arm_app64_defconfig index 3e00abb46c9..ad7874d9441 100644 --- a/configs/efi-arm_app64_defconfig +++ b/configs/efi-arm_app64_defconfig @@ -14,6 +14,7 @@ CONFIG_EFI_RAM_SIZE=0x20000000 CONFIG_FIT=y CONFIG_BOOTSTD_FULL=y CONFIG_SHOW_BOOT_PROGRESS=y +CONFIG_OF_SYSTEM_SETUP=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTCOMMAND="bootflow scan -lbp" CONFIG_SYS_PBSIZE=532 diff --git a/lib/efi_client/efi_app.c b/lib/efi_client/efi_app.c index 37f8e95d481..75ebe3a9719 100644 --- a/lib/efi_client/efi_app.c +++ b/lib/efi_client/efi_app.c @@ -287,6 +287,53 @@ int efi_app_exit_boot_services(struct efi_priv *priv, uint key) return 0; } +int ft_system_setup(void *fdt, struct bd_info *bd) +{ + struct efi_mem_desc *map, *desc, *end; + u64 ram_start, ram_end; + int desc_size; + int ret, upto; + uint version; + int size; + uint key; + + ret = efi_get_mmap(&map, &size, &key, &desc_size, &version); + if (ret) + return log_msg_ret("erm", ret); + + efi_dump_mem_table(map, size, desc_size, false); + ram_start = -1ULL; + ram_end = -1ULL; + end = (void *)map + size; + for (upto = 0, desc = map; desc < end; + desc = efi_get_next_mem_desc(desc, desc_size), upto++) { + u64 base = desc->physical_start, limit; + + if (!efi_mem_is_boot_services(desc->type) && + desc->type != EFI_CONVENTIONAL_MEMORY) + continue; + + if (ram_start == -1ULL) + ram_start = base; + limit = base + (desc->num_pages << EFI_PAGE_SHIFT); + log_debug("%d: %s: %llx limit %llx\n", upto, + efi_mem_type_name(desc->type), base, limit); + if (ram_end == -1ULL || limit > ram_end) + ram_end = limit; + } + + log_info("RAM extends from %llx to %llx\n", ram_start, ram_end); + ret = fdt_fixup_memory(fdt, ram_start, ram_end - ram_start); + if (ret) { + printf("failed fixup memory\n"); + return ret; + } + + free(map); + + return 0; +} + static const struct udevice_id efi_sysreset_ids[] = { { .compatible = "efi,reset" }, { } -- 2.43.0