Hi Tom,

please pull the following changes to your tree. The major part of this pull request is using only one defconfig for Xilinx ZynqMP platforms. The same change should also happen with Zynq platforms but I haven't had a time to do it (Microblaze is using it from the begining and Versal too). I have also added that custom script for u-boot.itb generation to get things going before unification can happen as we talked about.

I have sync up Linux DT with U-Boot but still there are things to work on.

There are some minor changes in generic code. For more information take a look at tag description below.

Travis looks good https://travis-ci.org/michalsimek/u-boot/builds/636763911 and gitlab CI too. https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze/pipelines/1849

Thanks, Michal

The following changes since commit 88366b96ee0d8640b2af53e4026dbaeed0fab5e0:

travis: Switch to QEMU v4.2.0 globally (2020-01-11 08:07:03 -0500)

are available in the Git repository at:

git@gitlab.denx.de:u-boot/custodians/u-boot-microblaze.git tags/xilinx-for-v2020.04

for you to fetch changes up to ddb55ff8a66dabe3365735eff9f901bb259c223f:

arm64: versal: Enable board_late_init calling (2020-01-14 09:06:42 +0100)

---------------------------------------------------------------- Xilinx/FPGA changes for v2020.04

ARM64: - Add INIT_SPL_RELATIVE dependency

SPL: - FIT image fix - Enable customization of bl2_plat_get_bl31_params()

Pytest: - Add test for octal/hex conversions

Microblaze: - Fix manual relocation for one SPI instance

Nand: - Convert zynq/zynqmp drivers to DM

Xilinx: - Enable boot script location via Kconfig - Support OF_SEPARATE in board FDT selection - Remove low level uart setup it is done later by code - Add support for DEVICE_TREE variable passing for SPL

Zynq: - Enable jtag boot mode via distro boot - Removing unused baseaddresses from hardware.h - DT fixups

ZynqMP: - Fix emmc boot sequence - Simplify spl logic around bss and board_init_r() - Support psu_post_config_data() calling - Tune mini-nand DTS - Fix psu wiring for a2197 boards - Add runtime MMC device boot order filling in spl - Clear ATF handoff handling with custom bl2_plat_get_bl31_params() - Add support u-boot.its generation - Use single image configuration for all platforms - Enable PANIC_HANG via Kconfig - DT fixups - Firmware fixes - Add support for zcu208 and zcu1285

Versal: - Fix emmc boot sequence - Enable board_late_init() by default

---------------------------------------------------------------- Ashok Reddy Soma (6): mtd: nand: Move arasan nand driver to driver model mtd: nand: Remove hardcoded base address of nand spi: Fix manual relocation calling more times zynq: mtd: nand: Move zynq nand driver to driver model zynq: mtd: nand: Remove hardcoded base addresses firmware: Remove probe which is causing extra bind

Jan Kiszka (1): arm64: dts: zcu100-revC: Give wifi some time after power-on

Michal Simek (33): spl: atf: Add missing ndepth initialization arm64: zynqmp: Do not call bss init and board_init_r from board_init_f arm64: Enable INIT_SP_RELATIVE by default when POC is enabled arm64: zynqmp: Rename fw_dtb variable to fdt_blob arm64: zynqmp: Add support for OF_SEPARATE with board DTB arm64: zynqmp: Do not assing MIO34 that early on zcu100 arm64: zynqmp: Remove low level UART setting arm: zynq: Remove low level UART setting arm64: zynqmp: Enable bind/unbind commands for all boards arm64: zynqmp: Remove nand partition description from mini-nand arm64: zynqmp: Fix symlinks to SC psu_init* files arm64: zynqmp: Add board_boot_order for MMC boot extension arm64: zynqmp: Fix return value of board_fit_config_name_match arm: xilinx: Use device tree which can be passed on cmd line spl: atf: Enable option to rewrite bl2_plat_get_bl31_params() arm: zynqmp: Wire SPL/ATF handoff structure properly ARM: zynq: Remove unused QSPI and USB addresses test/py: hush_if_test: Add tests to cover octal/hex values arm64: zynqmp: Add support for u-boot.itb generation with ATF arm64: zynqmp: Add missing Kconfig options to zynqmp_virt platform arm64: zynqmp: Use zynqmp_virt platform arm64: zynqmp: Move PANIC to Kconfig arm64: zynqmp: Fix ina226 shunt resistor value ARM: zynq: Add missing nand/smcc nodes arm64: zynqmp: Add support for zcu208 arm64: zynqmp: Switch zcu100 revC to use firmware clock driver net: zynq: Add a note about RX_BUF macro arm64: zynqmp: Add support for zcu1285 revA board arm64: zynqmp: Remove incorrect phy from DT for zcu102-revB up arm64: dts: zynqmp: Fix node names which contain "_" arm64: zynqmp: Sync gpio-controller name location arm64: zynqmp: Sync gem clock nodes with mainline Linux arm64: versal: Enable board_late_init calling

Raviteja Narayanam (1): arm64: zynqmp: Correct the type of eeprom for zcu216 boards

Rob Herring (1): arm64: dts: Remove inconsistent use of 'arm,armv8' compatible string

Sudeep Holla (1): arm64: dts: zynqmp: replace gpio-key,wakeup with wakeup-source property

T Karthik Reddy (5): arm64: versal: Fix emmc boot mode boot_target issue arm64: zynqmp: Fix emmc boot mode boot_target sequence board: xilinx: Add support for user configurable boot script offset ARM: zynq: Add jtag distro boot support zynqmp: dts: Cleanup no-1-8-v property from sdhci dt nodes

Zumeng Chen (1): ARM: dts: zynq: enablement of coresight topology

Kconfig | 3 +- arch/arm/Kconfig | 1 + arch/arm/dts/Makefile | 2 + arch/arm/dts/zynq-7000.dtsi | 135 +++++++++++++++++++++++++++++ arch/arm/dts/zynq-zc770-xm011.dts | 8 ++ arch/arm/dts/zynqmp-clk-ccf.dtsi | 22 +++-- arch/arm/dts/zynqmp-clk.dtsi | 4 +- arch/arm/dts/zynqmp-mini-nand.dts | 49 ----------- arch/arm/dts/zynqmp-zcu100-revC.dts | 9 +- arch/arm/dts/zynqmp-zcu102-revA.dts | 12 +-- arch/arm/dts/zynqmp-zcu102-revB.dts | 2 +- arch/arm/dts/zynqmp-zcu106-revA.dts | 5 +- arch/arm/dts/zynqmp-zcu111-revA.dts | 5 +- arch/arm/dts/zynqmp-zcu1275-revB.dts | 4 + arch/arm/dts/zynqmp-zcu1285-revA.dts | 245 +++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/zynqmp-zcu208-revA.dts | 588 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/zynqmp-zcu216-revA.dts | 6 +- arch/arm/dts/zynqmp.dtsi | 14 +-- arch/arm/mach-zynq/include/mach/hardware.h | 5 -- arch/arm/mach-zynqmp/Kconfig | 11 --- arch/arm/mach-zynqmp/handoff.c | 17 ++-- arch/arm/mach-zynqmp/include/mach/hardware.h | 2 - arch/arm/mach-zynqmp/include/mach/psu_init_gpl.h | 1 + arch/arm/mach-zynqmp/include/mach/sys_proto.h | 2 - arch/arm/mach-zynqmp/mkimage_fit_atf.sh | 123 ++++++++++++++++++++++++++ arch/arm/mach-zynqmp/psu_spl_init.c | 9 ++ arch/arm/mach-zynqmp/spl.c | 27 +++--- board/opalkelly/zynq/zynq-syzygy-hub/ps7_init_gpl.c | 4 - board/topic/zynq/zynq-topic-miami/ps7_init_gpl.c | 8 -- board/topic/zynq/zynq-topic-miamilite/ps7_init_gpl.c | 8 -- board/topic/zynq/zynq-topic-miamiplus/ps7_init_gpl.c | 8 -- board/xilinx/Kconfig | 11 ++- board/xilinx/common/board.c | 31 +++++-- board/xilinx/versal/board.c | 11 ++- board/xilinx/zynq/Makefile | 2 +- board/xilinx/zynq/board.c | 4 +- board/xilinx/zynq/zynq-cc108/ps7_init_gpl.c | 12 --- board/xilinx/zynq/zynq-dlc20-rev1.0/ps7_init_gpl.c | 4 - board/xilinx/zynq/zynq-microzed/ps7_init_gpl.c | 186 --------------------------------------- board/xilinx/zynq/zynq-zc702/ps7_init_gpl.c | 186 --------------------------------------- board/xilinx/zynq/zynq-zc706/ps7_init_gpl.c | 186 --------------------------------------- board/xilinx/zynq/zynq-zc770-xm010/ps7_init_gpl.c | 12 --- board/xilinx/zynq/zynq-zc770-xm011-x16/ps7_init_gpl.c | 12 --- board/xilinx/zynq/zynq-zc770-xm011/ps7_init_gpl.c | 12 --- board/xilinx/zynq/zynq-zc770-xm012/ps7_init_gpl.c | 12 --- board/xilinx/zynq/zynq-zc770-xm013/ps7_init_gpl.c | 12 --- board/xilinx/zynq/zynq-zed/ps7_init_gpl.c | 186 --------------------------------------- board/xilinx/zynq/zynq-zturn/ps7_init_gpl.c | 8 -- board/xilinx/zynq/zynq-zybo-z7/ps7_init_gpl.c | 4 - board/xilinx/zynq/zynq-zybo/ps7_init_gpl.c | 186 --------------------------------------- board/xilinx/zynqmp/Makefile | 2 +- board/xilinx/zynqmp/avnet-ultrazedev-cc-v1.0-ultrazedev-som-v1.0/psu_init_gpl.c | 8 -- board/xilinx/zynqmp/zynqmp-a2197-revA/psu_init_gpl.c | 8 -- board/xilinx/zynqmp/{zynqmp-a2197-g-revA => zynqmp-g-a2197-00-revA} | 0 board/xilinx/zynqmp/{zynqmp-a2197-m-revA => zynqmp-m-a2197-01-revA} | 0 board/xilinx/zynqmp/{zynqmp-a2197-p-revA => zynqmp-m-a2197-02-revA} | 0 board/xilinx/zynqmp/zynqmp-m-a2197-03-revA | 1 + board/xilinx/zynqmp/zynqmp-p-a2197-00-revA | 1 + board/xilinx/zynqmp/zynqmp-zc1232-revA/psu_init_gpl.c | 4 - board/xilinx/zynqmp/zynqmp-zc1254-revA/psu_init_gpl.c | 4 - board/xilinx/zynqmp/zynqmp-zc1275-revB/psu_init_gpl.c | 4 - board/xilinx/zynqmp/zynqmp-zc1751-xm015-dc1/psu_init_gpl.c | 4 - board/xilinx/zynqmp/zynqmp-zc1751-xm016-dc2/psu_init_gpl.c | 8 -- board/xilinx/zynqmp/zynqmp-zc1751-xm017-dc3/psu_init_gpl.c | 8 -- board/xilinx/zynqmp/zynqmp-zc1751-xm018-dc4/psu_init_gpl.c | 8 -- board/xilinx/zynqmp/zynqmp-zc1751-xm019-dc5/psu_init_gpl.c | 8 -- board/xilinx/zynqmp/zynqmp-zcu100-revC/psu_init_gpl.c | 15 ++-- board/xilinx/zynqmp/zynqmp-zcu102-rev1.0/psu_init_gpl.c | 8 -- board/xilinx/zynqmp/zynqmp-zcu102-revA/psu_init_gpl.c | 8 -- board/xilinx/zynqmp/zynqmp-zcu104-revA/psu_init_gpl.c | 8 -- board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 8 -- board/xilinx/zynqmp/zynqmp.c | 15 +++- common/spl/spl_atf.c | 17 +--- configs/avnet_ultra96_rev1_defconfig | 90 ------------------- configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig | 2 +- configs/xilinx_versal_virt_defconfig | 1 - configs/xilinx_zynqmp_a2197_revA_defconfig | 113 ------------------------ configs/xilinx_zynqmp_e_a2197_00_revA_defconfig | 111 ------------------------ configs/xilinx_zynqmp_g_a2197_00_revA_defconfig | 111 ------------------------ configs/xilinx_zynqmp_m_a2197_01_revA_defconfig | 111 ------------------------ configs/xilinx_zynqmp_m_a2197_02_revA_defconfig | 111 ------------------------ configs/xilinx_zynqmp_m_a2197_03_revA_defconfig | 111 ------------------------ configs/xilinx_zynqmp_mini_defconfig | 1 + configs/xilinx_zynqmp_mini_emmc0_defconfig | 1 + configs/xilinx_zynqmp_mini_emmc1_defconfig | 1 + configs/xilinx_zynqmp_mini_nand_defconfig | 1 + configs/xilinx_zynqmp_mini_nand_single_defconfig | 1 + configs/xilinx_zynqmp_mini_qspi_defconfig | 1 + configs/xilinx_zynqmp_p_a2197_00_revA_defconfig | 112 ------------------------ configs/xilinx_zynqmp_virt_defconfig | 38 +++++++- configs/xilinx_zynqmp_zc1232_revA_defconfig | 49 ----------- configs/xilinx_zynqmp_zc1254_revA_defconfig | 49 ----------- configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 95 -------------------- configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 87 ------------------- configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig | 82 ------------------ configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 67 -------------- configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 60 ------------- configs/xilinx_zynqmp_zcu100_revC_defconfig | 87 ------------------- configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 111 ------------------------ configs/xilinx_zynqmp_zcu102_revA_defconfig | 111 ------------------------ configs/xilinx_zynqmp_zcu102_revB_defconfig | 110 ----------------------- configs/xilinx_zynqmp_zcu104_revA_defconfig | 91 ------------------- configs/xilinx_zynqmp_zcu104_revC_defconfig | 95 -------------------- configs/xilinx_zynqmp_zcu106_revA_defconfig | 104 ---------------------- configs/xilinx_zynqmp_zcu111_revA_defconfig | 93 -------------------- configs/xilinx_zynqmp_zcu1275_revA_defconfig | 49 ----------- configs/xilinx_zynqmp_zcu1275_revB_defconfig | 58 ------------- configs/xilinx_zynqmp_zcu216_revA_defconfig | 94 -------------------- drivers/firmware/firmware-zynqmp.c | 1 - drivers/mtd/nand/raw/Kconfig | 2 + drivers/mtd/nand/raw/arasan_nfc.c | 364 +++++++++++++++++++++++++++++++++++++++++++--------------------------------- drivers/mtd/nand/raw/zynq_nand.c | 132 ++++++++++++++++++---------- drivers/net/zynq_gem.c | 1 + drivers/spi/spi-uclass.c | 34 ++++---- include/configs/xilinx_versal.h | 1 - include/configs/xilinx_zynqmp.h | 8 +- include/configs/zynq-common.h | 10 ++- include/spl.h | 20 +++++ test/py/tests/test_hush_if_test.py | 31 +++++++ 119 files changed, 1677 insertions(+), 3899 deletions(-) create mode 100644 arch/arm/dts/zynqmp-zcu1285-revA.dts create mode 100644 arch/arm/dts/zynqmp-zcu208-revA.dts create mode 100755 arch/arm/mach-zynqmp/mkimage_fit_atf.sh rename board/xilinx/zynqmp/{zynqmp-a2197-g-revA => zynqmp-g-a2197-00-revA} (100%) rename board/xilinx/zynqmp/{zynqmp-a2197-m-revA => zynqmp-m-a2197-01-revA} (100%) rename board/xilinx/zynqmp/{zynqmp-a2197-p-revA => zynqmp-m-a2197-02-revA} (100%) create mode 120000 board/xilinx/zynqmp/zynqmp-m-a2197-03-revA create mode 120000 board/xilinx/zynqmp/zynqmp-p-a2197-00-revA delete mode 100644 configs/avnet_ultra96_rev1_defconfig delete mode 100644 configs/xilinx_zynqmp_a2197_revA_defconfig delete mode 100644 configs/xilinx_zynqmp_e_a2197_00_revA_defconfig delete mode 100644 configs/xilinx_zynqmp_g_a2197_00_revA_defconfig delete mode 100644 configs/xilinx_zynqmp_m_a2197_01_revA_defconfig delete mode 100644 configs/xilinx_zynqmp_m_a2197_02_revA_defconfig delete mode 100644 configs/xilinx_zynqmp_m_a2197_03_revA_defconfig delete mode 100644 configs/xilinx_zynqmp_p_a2197_00_revA_defconfig delete mode 100644 configs/xilinx_zynqmp_zc1232_revA_defconfig delete mode 100644 configs/xilinx_zynqmp_zc1254_revA_defconfig delete mode 100644 configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig delete mode 100644 configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig delete mode 100644 configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig delete mode 100644 configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig delete mode 100644 configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig delete mode 100644 configs/xilinx_zynqmp_zcu100_revC_defconfig delete mode 100644 configs/xilinx_zynqmp_zcu102_rev1_0_defconfig delete mode 100644 configs/xilinx_zynqmp_zcu102_revA_defconfig delete mode 100644 configs/xilinx_zynqmp_zcu102_revB_defconfig delete mode 100644 configs/xilinx_zynqmp_zcu104_revA_defconfig delete mode 100644 configs/xilinx_zynqmp_zcu104_revC_defconfig delete mode 100644 configs/xilinx_zynqmp_zcu106_revA_defconfig delete mode 100644 configs/xilinx_zynqmp_zcu111_revA_defconfig delete mode 100644 configs/xilinx_zynqmp_zcu1275_revA_defconfig delete mode 100644 configs/xilinx_zynqmp_zcu1275_revB_defconfig delete mode 100644 configs/xilinx_zynqmp_zcu216_revA_defconfig