Hi Tom,
Please pull these patches to your tree. Travis looks good. https://travis-ci.org/github/michalsimek/u-boot/builds/680070323
Gitlab CI too https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze/pipelines/2952
I have tried to merge with your latest branch and there is small conflict because of defconfig resync. It is easy to resolve like this.
diff --cc configs/zynq_cse_nand_defconfig index 80a427d905d3,19491c9e47eb..000000000000 --- a/configs/zynq_cse_nand_defconfig +++ b/configs/zynq_cse_nand_defconfig @@@ -4,8 -4,8 +4,8 @@@ CONFIG_SYS_ICACHE_OFF= CONFIG_SYS_DCACHE_OFF=y CONFIG_ARCH_ZYNQ=y CONFIG_SYS_TEXT_BASE=0x100000 - CONFIG_SYS_MALLOC_LEN=0x8000 CONFIG_ENV_SIZE=0x190 -CONFIG_SYS_MALLOC_LEN=0x1000 ++CONFIG_SYS_MALLOC_LEN=0x8000 CONFIG_SPL_STACK_R_ADDR=0x200000 CONFIG_SPL=y CONFIG_SYS_CUSTOM_LDSCRIPT=y
Thanks, Michal
The following changes since commit d202f67db0771247de562af5d6a5df778702857b:
Merge branch '2020-04-25-master-imports' (2020-04-25 08:20:22 -0400)
are available in the Git repository at:
git@gitlab.denx.de:u-boot/custodians/u-boot-microblaze.git tags/xilinx-for-v2020.07-rc2
for you to fetch changes up to 27d706937a5c72f0414a540ca20fd36b4b72bda7:
ARM: zynq: Fix invalid check on NAND_CMD_NONE. (2020-04-27 14:21:18 +0200)
---------------------------------------------------------------- Xilinx changes for v2020.07-rc2
mmc: - Fix dt property handling via generic function
clk: - Fix versal watchdog clock setting
nand: - Fix zynq nand command comparison
xilinx: - Enable ubifs - Sync board_late_init configurations with initrd_high setup - Make custom distro boot more verbose
zynq: - Kconfig alignments - Fix nand cse configuration
zynqmp: - Fix zcu104 low level qspi configuration - Small DT updates
---------------------------------------------------------------- Benedikt Grassl (1): mmc: zynq: parse dt when probing
Michal Simek (8): xilinx: Enable MTD and UBIFS for zynq and zynqmp ARM: zynq: Setup stack size via Kconfig xilinx: Introduce board_late_init_xilinx() xilinx: zynqmp: Fix MIO 18 configuration on zcu104 revC xilinx: Move initrd_high setup to common location xilinx: Move bootmode detection to separate function arm64: zynqmp: Fix irps5401 device nodes xilinx: Make Xilinx custom distro boot commands more verbose
Patrick van Gelder (1): ARM: zynq: Fix invalid check on NAND_CMD_NONE.
Saeed Nowshadi (1): arm64: zynqmp: Add label to GPIO lines for boot mode and POR
T Karthik Reddy (3): clk: versal: Fix watchdog clock issue ARM: zynq: Add nand controller node in zynq-ces-nand dt ARM: zynq: Change SYS_MALLOC_LEN in zynq_cse_nand_defconfig
arch/arm/Kconfig | 3 ++- arch/arm/dts/zynq-cse-nand.dts | 15 +++++++++++++++ arch/arm/dts/zynqmp-e-a2197-00-revA.dts | 22 ++++++++++++++++------ arch/arm/dts/zynqmp-zcu104-revA.dts | 10 ++++------ arch/arm/dts/zynqmp-zcu104-revC.dts | 10 ++++------ arch/arm/dts/zynqmp-zcu111-revA.dts | 9 +++------ arch/arm/dts/zynqmp-zcu208-revA.dts | 6 ++---- arch/arm/dts/zynqmp-zcu216-revA.dts | 6 ++---- board/bitmain/antminer_s9/Makefile | 1 + board/topic/zynq/Makefile | 1 + board/xilinx/common/board.c | 15 +++++++++++++++ board/xilinx/common/board.h | 12 ++++++++++++ board/xilinx/versal/board.c | 34 ++++++++++++++++++---------------- board/xilinx/zynq/board.c | 5 ++--- board/xilinx/zynqmp/zynqmp-zcu104-revA/psu_init_gpl.c | 3 ++- board/xilinx/zynqmp/zynqmp.c | 39 +++++++++++++++++++++------------------ configs/xilinx_zynq_virt_defconfig | 5 +++++ configs/xilinx_zynqmp_virt_defconfig | 5 +++++ configs/zynq_cse_nand_defconfig | 2 +- drivers/clk/clk_versal.c | 5 ++++- drivers/mmc/sdhci.c | 3 +-- drivers/mmc/zynq_sdhci.c | 15 ++++++--------- drivers/mtd/nand/raw/zynq_nand.c | 2 +- include/configs/xilinx_versal.h | 12 ++++++++---- include/configs/xilinx_zynqmp.h | 9 ++++++--- include/configs/zynq-common.h | 13 ++++++++----- include/sdhci.h | 1 - 27 files changed, 165 insertions(+), 98 deletions(-) create mode 100644 board/xilinx/common/board.h