]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
efi_loader: use EFI_PAGE_SIZE instead of 4096
authorxypron.glpk@gmx.de <xypron.glpk@gmx.de>
Fri, 11 Aug 2017 19:19:25 +0000 (21:19 +0200)
committerAlexander Graf <agraf@suse.de>
Sat, 12 Aug 2017 12:06:23 +0000 (14:06 +0200)
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>
Signed-off-by: Alexander Graf <agraf@suse.de>
cmd/bootefi.c

index d20775eccd99c709aab87c20c21afad6f91bcf22..3196d86040729487186c241e9b7c36d597bbb6f2 100644 (file)
@@ -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");