diff options
| author | Tom Rini <[email protected]> | 2020-05-08 14:56:23 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-05-08 14:56:23 -0400 |
| commit | a5e609b982a004e009e8ee0aa6066785db425ac2 (patch) | |
| tree | 3e687989c84d8a2f4bb9b4f06bb4b4bfe558d98a /cmd | |
| parent | ea02cfb6495eb5f54bf239405316746a19d303b2 (diff) | |
| parent | d7ca3ce3d3b990503cb6e0bafad91aa2a7c96b9d (diff) | |
Merge tag 'efi-2020-07-rc2-3' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Pull request for UEFI sub-system for efi-2020-07-rc2-3
This series contains bug fixes and code simplifications.
Following clarification in the discussion of the EBBR specification
device trees will be passed as EfiACPIReclaimMemory to UEFI applications.
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/bootefi.c | 4 | ||||
| -rw-r--r-- | cmd/nvedit_efi.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmd/bootefi.c b/cmd/bootefi.c index 54b4b8f9845..06573b14e9b 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -127,13 +127,13 @@ static efi_status_t copy_fdt(void **fdtp) new_fdt_addr = (uintptr_t)map_sysmem(fdt_ram_start + 0x7f00000 + fdt_size, 0); ret = efi_allocate_pages(EFI_ALLOCATE_MAX_ADDRESS, - EFI_BOOT_SERVICES_DATA, fdt_pages, + EFI_ACPI_RECLAIM_MEMORY, fdt_pages, &new_fdt_addr); if (ret != EFI_SUCCESS) { /* If we can't put it there, put it somewhere */ new_fdt_addr = (ulong)memalign(EFI_PAGE_SIZE, fdt_size); ret = efi_allocate_pages(EFI_ALLOCATE_MAX_ADDRESS, - EFI_BOOT_SERVICES_DATA, fdt_pages, + EFI_ACPI_RECLAIM_MEMORY, fdt_pages, &new_fdt_addr); if (ret != EFI_SUCCESS) { printf("ERROR: Failed to reserve space for FDT\n"); diff --git a/cmd/nvedit_efi.c b/cmd/nvedit_efi.c index 837e39e0217..6f69a84feaa 100644 --- a/cmd/nvedit_efi.c +++ b/cmd/nvedit_efi.c @@ -298,7 +298,7 @@ int do_env_print_efi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return CMD_RET_USAGE; /* -a already specified */ - if (!default_guid & guid_any) + if (!default_guid && guid_any) return CMD_RET_USAGE; argc--; |