summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-07-04 12:00:16 (GMT)
committerTom Rini <trini@konsulko.com>2017-07-04 12:00:16 (GMT)
commit7e09145ea2e985511c660bdf567b61614acd75b3 (patch)
tree91860537dec991900895747c64c957785c7d32f6 /cmd
parent2f4c1d83f4e838bda4a02a408321aebc746b9eaa (diff)
parentda684a646d0c94f7a6126e7ecf110278691465a6 (diff)
downloadu-boot-fsl-qoriq-7e09145ea2e985511c660bdf567b61614acd75b3.tar.xz
Merge tag 'signed-efi-next' of git://github.com/agraf/u-boot
Patch queue for efi - 2017-07-04 Highlights this time: bugfixes. With these changes, OpenBSD should be more happy.
Diffstat (limited to 'cmd')
-rw-r--r--cmd/bootefi.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/cmd/bootefi.c b/cmd/bootefi.c
index a0a5434..771300e 100644
--- a/cmd/bootefi.c
+++ b/cmd/bootefi.c
@@ -133,7 +133,13 @@ static void *copy_fdt(void *fdt)
&new_fdt_addr) != EFI_SUCCESS) {
/* If we can't put it there, put it somewhere */
new_fdt_addr = (ulong)memalign(4096, 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");
+ return NULL;
+ }
}
+
new_fdt = (void*)(ulong)new_fdt_addr;
memcpy(new_fdt, fdt, fdt_totalsize(fdt));
fdt_set_totalsize(new_fdt, fdt_size);