GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-04-01 12:01:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

efi_loader: call add_u_boot_and_runtime() on sandbox

Browse source 
On the sandbox we should mark the stack area as EFI runtime memory like we
do on any other architecture.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
Heinrich Schuchardt 2019-11-08 20:42:53 +01:00
parent 89cb6a5dd6
commit 7264e21fde
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/efi_loader/efi_memory.c
View file

@ -738,8 +738,10 @@ static void add_u_boot_and_runtime(void)
unsigned long uboot_stack_size = 16 * 1024 * 1024; unsigned long uboot_stack_size = 16 * 1024 * 1024;
/* Add U-Boot */ /* Add U-Boot */
uboot_start = (gd->start_addr_sp - uboot_stack_size) & ~EFI_PAGE_MASK; uboot_start = ((uintptr_t)map_sysmem(gd->start_addr_sp, 0) -
uboot_pages = (gd->ram_top - uboot_start) >> EFI_PAGE_SHIFT; uboot_stack_size) & ~EFI_PAGE_MASK;
uboot_pages = ((uintptr_t)map_sysmem(gd->ram_top - 1, 0) -
uboot_start + EFI_PAGE_MASK) >> EFI_PAGE_SHIFT;
efi_add_memory_map(uboot_start, uboot_pages, EFI_LOADER_DATA, false); efi_add_memory_map(uboot_start, uboot_pages, EFI_LOADER_DATA, false);
#if defined(__aarch64__) #if defined(__aarch64__)
@ -767,8 +769,7 @@ int efi_memory_init(void)
{ {
efi_add_known_memory(); efi_add_known_memory();
if (!IS_ENABLED(CONFIG_SANDBOX)) add_u_boot_and_runtime();
add_u_boot_and_runtime();
#ifdef CONFIG_EFI_LOADER_BOUNCE_BUFFER #ifdef CONFIG_EFI_LOADER_BOUNCE_BUFFER
/* Request a 32bit 64MB bounce buffer region */ /* Request a 32bit 64MB bounce buffer region */