diff options
| author | Tom Rini <trini@konsulko.com> | 2017-08-18 22:24:58 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-08-18 22:24:58 (GMT) |
| commit | 5619295995e3262bb5770e8b5e945ffdc5442145 (patch) | |
| tree | 6ba37499aeb10145237379ac9c54dd01ea5aaf3b /cmd | |
| parent | 1fdafb2e3dfecdc4129a8062ad25b1adb32b0efb (diff) | |
| parent | c81883dfce7360148c72922b93bfa16b399ee3ee (diff) | |
| download | u-boot-5619295995e3262bb5770e8b5e945ffdc5442145.tar.xz | |
Merge tag 'signed-efi-next' of git://github.com/agraf/u-boot
EFI Fixes for 2017.09:
- Fix GOP w/o display
- Fix LocateHandle
- Fix exit return value truncation
- Fix missing EFIAPI in efi_locate_handle (for x86)
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/bootefi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/bootefi.c b/cmd/bootefi.c index d20775e..3196d86 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -158,7 +158,7 @@ static void *copy_fdt(void *fdt) } /* Give us at least 4kb breathing room */ - fdt_size = ALIGN(fdt_size + 4096, 4096); + fdt_size = ALIGN(fdt_size + 4096, EFI_PAGE_SIZE); fdt_pages = fdt_size >> EFI_PAGE_SHIFT; /* Safe fdt location is at 128MB */ @@ -166,7 +166,7 @@ static void *copy_fdt(void *fdt) if (efi_allocate_pages(1, EFI_BOOT_SERVICES_DATA, fdt_pages, &new_fdt_addr) != EFI_SUCCESS) { /* If we can't put it there, put it somewhere */ - new_fdt_addr = (ulong)memalign(4096, fdt_size); + new_fdt_addr = (ulong)memalign(EFI_PAGE_SIZE, fdt_size); if (efi_allocate_pages(1, EFI_BOOT_SERVICES_DATA, fdt_pages, &new_fdt_addr) != EFI_SUCCESS) { printf("ERROR: Failed to reserve space for FDT\n"); |