From f4af97cdb4b9d702bf7d76d896e3b6d13a162bb3 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Wed, 4 Jan 2023 03:17:15 +0100 Subject: vexpress: adjust loadaddr On the vexpress_ca9x4 $loadaddr points to a memory area used by the EFI sub-system. Use the same value as $kernel_addr_r which is safe. Signed-off-by: Heinrich Schuchardt --- include/configs/vexpress_common.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h index 5d773060d82..aac96d29ba7 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -147,6 +147,7 @@ #include #define CONFIG_EXTRA_ENV_SETTINGS \ + "loadaddr=0x60100000\0" \ "kernel_addr_r=0x60100000\0" \ "fdt_addr_r=0x60000000\0" \ "bootargs=console=tty0 console=ttyAMA0,38400n8\0" \ -- cgit v1.2.3 From eff444019545642a844431692dd51829aa52528c Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Thu, 5 Jan 2023 18:26:01 +0100 Subject: efi_loader: carve out efi_get_memory_map_alloc() Carve out code from efidebug command used to read the memory map. Signed-off-by: Heinrich Schuchardt --- include/efi_loader.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include') diff --git a/include/efi_loader.h b/include/efi_loader.h index 699176872dd..f9e427f0905 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -736,6 +736,9 @@ efi_status_t efi_allocate_pool(enum efi_memory_type pool_type, efi_uintn_t size, void **buffer); /* EFI pool memory free function. */ efi_status_t efi_free_pool(void *buffer); +/* Allocate and retrieve EFI memory map */ +efi_status_t efi_get_memory_map_alloc(efi_uintn_t *map_size, + struct efi_mem_desc **memory_map); /* Returns the EFI memory map */ efi_status_t efi_get_memory_map(efi_uintn_t *memory_map_size, struct efi_mem_desc *memory_map, -- cgit v1.2.3