mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-28 15:41:40 +00:00
efi_loader: put device tree into EfiACPIReclaimMemory
According to the UEFI spec ACPI tables should be placed in EfiACPIReclaimMemory. Let's do the same with the device tree. Suggested-by: Ard Biesheuvel <ardb@kernel.org> Cc: Grant Likely <grant.likely@arm.com> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
parent
9900e4623a
commit
42a426e027
2 changed files with 4 additions and 4 deletions
|
@ -127,13 +127,13 @@ static efi_status_t copy_fdt(void **fdtp)
|
|||
new_fdt_addr = (uintptr_t)map_sysmem(fdt_ram_start + 0x7f00000 +
|
||||
fdt_size, 0);
|
||||
ret = efi_allocate_pages(EFI_ALLOCATE_MAX_ADDRESS,
|
||||
EFI_BOOT_SERVICES_DATA, fdt_pages,
|
||||
EFI_ACPI_RECLAIM_MEMORY, fdt_pages,
|
||||
&new_fdt_addr);
|
||||
if (ret != EFI_SUCCESS) {
|
||||
/* If we can't put it there, put it somewhere */
|
||||
new_fdt_addr = (ulong)memalign(EFI_PAGE_SIZE, fdt_size);
|
||||
ret = efi_allocate_pages(EFI_ALLOCATE_MAX_ADDRESS,
|
||||
EFI_BOOT_SERVICES_DATA, fdt_pages,
|
||||
EFI_ACPI_RECLAIM_MEMORY, fdt_pages,
|
||||
&new_fdt_addr);
|
||||
if (ret != EFI_SUCCESS) {
|
||||
printf("ERROR: Failed to reserve space for FDT\n");
|
||||
|
|
|
@ -176,9 +176,9 @@ static int execute(void)
|
|||
/* Check memory reservation for the device tree */
|
||||
if (fdt_addr &&
|
||||
find_in_memory_map(map_size, memory_map, desc_size, fdt_addr,
|
||||
EFI_BOOT_SERVICES_DATA) != EFI_ST_SUCCESS) {
|
||||
EFI_ACPI_RECLAIM_MEMORY) != EFI_ST_SUCCESS) {
|
||||
efi_st_error
|
||||
("Device tree not marked as boot services data\n");
|
||||
("Device tree not marked as ACPI reclaim memory\n");
|
||||
return EFI_ST_FAILURE;
|
||||
}
|
||||
return EFI_ST_SUCCESS;
|
||||
|
|
Loading…
Reference in a new issue