[U-Boot,1/1] efi_loader: use EFI_PAGE_SIZE instead of 4096

Submitted by xypron.glpk@gmx.de on Aug. 11, 2017, 7:19 p.m.

Details

Message ID 20170811191925.27581-1-xypron.glpk@gmx.de
State Accepted
Delegated to: Alexander Graf
Headers show

Commit Message

xypron.glpk@gmx.de Aug. 11, 2017, 7:19 p.m.
We should use constant EFI_PAGE_SIZE instead of 4096 where the
coding relies on 4096 being EFI_PAGE_SIZE.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
---
 cmd/bootefi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/cmd/bootefi.c b/cmd/bootefi.c
index d20775eccd..3196d86040 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");