diff options
| author | Tom Rini <trini@konsulko.com> | 2021-02-27 08:06:10 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-02-27 08:06:10 -0500 |
| commit | 9935050b443a7beda368e7fedb1f8611653eeedb (patch) | |
| tree | abb9031f6343ebf18ac7e28391a65704c72c9adf /lib/efi_loader/efi_acpi.c | |
| parent | 08cca188c120b8337600091c94dc0e211cd03e10 (diff) | |
| parent | a2c3f1bca4bf21371d041d1de589039aa3459e91 (diff) | |
Merge tag 'efi-2021-04-rc3-2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Pull request for efi-2021-04-rc3-2
Bug fixes:
* debug build for mkeficapsule
* limit output length for VenHw, VenMedia
* ACPI tables must be in EfiACPIReclaimMemory
Diffstat (limited to 'lib/efi_loader/efi_acpi.c')
| -rw-r--r-- | lib/efi_loader/efi_acpi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/efi_loader/efi_acpi.c b/lib/efi_loader/efi_acpi.c index 585b2d2b636..a62c34009cc 100644 --- a/lib/efi_loader/efi_acpi.c +++ b/lib/efi_loader/efi_acpi.c @@ -25,7 +25,7 @@ efi_status_t efi_acpi_register(void) /* Reserve 64kiB page for ACPI */ ret = efi_allocate_pages(EFI_ALLOCATE_MAX_ADDRESS, - EFI_RUNTIME_SERVICES_DATA, 16, &acpi); + EFI_ACPI_RECLAIM_MEMORY, 16, &acpi); if (ret != EFI_SUCCESS) return ret; @@ -34,7 +34,6 @@ efi_status_t efi_acpi_register(void) * a 4k-aligned address, so it is safe to assume that * write_acpi_tables() will write the table at that address. */ - assert(!(acpi & 0xf)); write_acpi_tables(acpi); /* And expose them to our EFI payload */ |