diff options
| author | Tom Rini <trini@konsulko.com> | 2020-03-31 10:05:57 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-03-31 10:05:57 -0400 |
| commit | 1104dde6e89f3d3ab07284e7c871cc33037f1198 (patch) | |
| tree | c7ce7355e30a785007038924b68e7f8870b574fb /cmd/efidebug.c | |
| parent | d1048a60cf874deb6cabc44f6abb4b8d71305e09 (diff) | |
| parent | 67357553ad59eb9b4f412412252e02868ceb16dc (diff) | |
Merge tag 'efi-2020-04-rc5' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Pull request for UEFI sub-system for efi-2020-04-rc5
This series fixes:
* UEFI Python tests CONFIG_OF_CONTROL=y.
* int to pointer cast warning for cmd/efidebug.c
* memory reservation even if fdt node is disabled
Now that the Python test is fixed reintroduce the reverted patch for
vexpress_ca9x4 to enable EFI_LOADER and define the dtb file name.
Diffstat (limited to 'cmd/efidebug.c')
| -rw-r--r-- | cmd/efidebug.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cmd/efidebug.c b/cmd/efidebug.c index bb7c13d6a1c..c1bb76477a6 100644 --- a/cmd/efidebug.c +++ b/cmd/efidebug.c @@ -489,10 +489,12 @@ static int do_efi_show_memmap(cmd_tbl_t *cmdtp, int flag, printf("%-16s %.*llx-%.*llx", type, EFI_PHYS_ADDR_WIDTH, - (u64)map_to_sysmem((void *)map->physical_start), + (u64)map_to_sysmem((void *)(uintptr_t) + map->physical_start), EFI_PHYS_ADDR_WIDTH, - (u64)map_to_sysmem((void *)map->physical_start + - map->num_pages * EFI_PAGE_SIZE)); + (u64)map_to_sysmem((void *)(uintptr_t) + (map->physical_start + + map->num_pages * EFI_PAGE_SIZE))); print_memory_attributes(map->attribute); putc('\n'); |