mirror of
https://xff.cz/git/u-boot/
synced 2025-09-01 08:42:12 +02:00
Merge tag 'xilinx-for-v2020.07' of https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze into next
Xilinx changes for v2020.07 common: - Align ENV_FAT_INTERFACE - Fix MAC address source print log - Improve based autodetection code xilinx: - Enable netconsole Microblaze: - Setup default ENV_OFFSET/ENV_SECT_SIZE Zynq: - Multiple DT updates/fixes - Use DEVICE_TREE environment variable for DTB selection - Switch to single zynq configuration - Enable NOR flash via DM - Minor SPL print removal - Enable i2c mux driver ZynqMP: - Print multiboot register - Enable cache commands in mini mtest - Multiple DT updates/fixes - Fix firmware probing when driver is not enabled - Specify 3rd backup RAM boot mode in SPL - Add SPL support for zcu102 v1.1 and zcu111 revA - Redesign debug uart enabling and psu_init delay - Enable full u-boot run from EL3 - Enable u-boot.itb generation without ATF with U-Boot in EL3 Versal: - Enable distro default - Enable others SPI flashes - Enable systems without DDR Drivers: - Gem: - Flush memory after freeing - Handle mdio bus separately - Watchdog: - Get rid of unused global data pointer - Enable window watchdog timer - Serial: - Change reinitialization logic in zynq serial driver Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
@@ -199,7 +199,8 @@ static void efi_carve_out_dt_rsv(void *fdt)
|
||||
* The /reserved-memory node may have children with
|
||||
* a size instead of a reg property.
|
||||
*/
|
||||
if (addr != FDT_ADDR_T_NONE)
|
||||
if (addr != FDT_ADDR_T_NONE &&
|
||||
fdtdec_get_is_enabled(fdt, subnode))
|
||||
efi_reserve_memory(addr, size);
|
||||
subnode = fdt_next_subnode(fdt, subnode);
|
||||
}
|
||||
|
@@ -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');
|
||||
|
@@ -264,7 +264,7 @@ static int do_mmcrpmb(cmd_tbl_t *cmdtp, int flag,
|
||||
return CMD_RET_FAILURE;
|
||||
|
||||
if (!(mmc->version & MMC_VERSION_MMC)) {
|
||||
printf("It is not a EMMC device\n");
|
||||
printf("It is not an eMMC device\n");
|
||||
return CMD_RET_FAILURE;
|
||||
}
|
||||
if (mmc->version < MMC_VERSION_4_41) {
|
||||
@@ -718,7 +718,7 @@ static int do_mmc_boot_resize(cmd_tbl_t *cmdtp, int flag,
|
||||
return CMD_RET_FAILURE;
|
||||
|
||||
if (IS_SD(mmc)) {
|
||||
printf("It is not a EMMC device\n");
|
||||
printf("It is not an eMMC device\n");
|
||||
return CMD_RET_FAILURE;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user