diff options
| author | Tom Rini <trini@konsulko.com> | 2023-01-07 12:32:42 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-01-07 12:32:42 -0500 |
| commit | be914b00df4aeb6c115b412313f31daedab75fb5 (patch) | |
| tree | b300b0210942482ba87e61b14e20ea8199fcaed6 /include | |
| parent | 9ddcdcc03cc6f0f46895604c589af17fdbdfe8b7 (diff) | |
| parent | 4bba71ff83e2b2a1607c5b3b9995767691242b29 (diff) | |
Merge tag 'efi-2023-01-rc5-4' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-2023-01-rc5-4
UEFI:
* correct the vexpress loaddr which collides with memory used by EFI
* consider the EFI memory map for LMB memory reservation
* avoid RWX section warnings for .data section of *_efi.so files
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/vexpress_common.h | 1 | ||||
| -rw-r--r-- | include/efi_loader.h | 3 |
2 files changed, 4 insertions, 0 deletions
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 <config_distro_bootcmd.h> #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" \ 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, |