mirror of
https://xff.cz/git/u-boot/
synced 2025-09-01 00:32:04 +02:00
Merge tag 'xilinx-for-v2020.01' of https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze
Xilinx/FPGA changes for v2020.01 FPGA: - Enable fpga loading on Versal - Minor fix Microblaze: - Fix LMB configurations to support initrds - Some other cleanups Zynq: - Minor config/dt changes - Add distro boot support for usb1 and mmc1 - Remove Xilinx private boot commands and use only distro boot ZynqMP: - Kconfig cleanups, defconfig updates - Update some dt files - Add firmware driver for talking to PMUFW - Extend distro boot support for jtag - Add new IDs - Add system controller configurations - Convert code to talk firmware via mailbox or SMCs Versal: - Add board_late_init() - Add run time DT memory setup - Add DFU support - Extend distro boot support for jtag and dfu - Add clock driver - Tune mini configurations Xilinx: - Improve documentation (boot scripts, dt binding) - Enable run time initrd_high calculation - Define default SYS_PROMPT - Add zynq/zynqmp virtual defconfig Drivers: - Add Xilinx mailbox driver for talking to firmware - Clean zynq_gem for Versal - Move ZYNQ_HISPD_BROKEN to Kconfig - Wire genphy_init() in phy.c - Add Xilinx gii2rgmii bridge - Cleanup zynq_sdhci - dwc3 fix - zynq_gpio fix - axi_emac fix Others: - apalis-tk1 - clean config file
This commit is contained in:
@@ -583,7 +583,7 @@ ulong env_get_bootm_low(void)
|
||||
|
||||
#if defined(CONFIG_SYS_SDRAM_BASE)
|
||||
return CONFIG_SYS_SDRAM_BASE;
|
||||
#elif defined(CONFIG_ARM)
|
||||
#elif defined(CONFIG_ARM) || defined(CONFIG_MICROBLAZE)
|
||||
return gd->bd->bi_dram[0].start;
|
||||
#else
|
||||
return 0;
|
||||
@@ -600,7 +600,8 @@ phys_size_t env_get_bootm_size(void)
|
||||
return tmp;
|
||||
}
|
||||
|
||||
#if defined(CONFIG_ARM) && defined(CONFIG_NR_DRAM_BANKS)
|
||||
#if (defined(CONFIG_ARM) || defined(CONFIG_MICROBLAZE)) && \
|
||||
defined(CONFIG_NR_DRAM_BANKS)
|
||||
start = gd->bd->bi_dram[0].start;
|
||||
size = gd->bd->bi_dram[0].size;
|
||||
#else
|
||||
|
Reference in New Issue
Block a user