Hi Tom,

please pull these changes to your tree.

Travis looks good. https://travis-ci.org/michalsimek/u-boot/builds/357294420

And buildman output too.

Thanks, Michal

The following changes since commit b0af10443afcb9e0dcfe18a7b8a013b230df9e39:

Merge git://git.denx.de/u-boot-net (2018-03-22 16:35:43 -0400)

are available in the git repository at:

git://www.denx.de/git/u-boot-microblaze.git tags/xilinx-for-v2018.05

for you to fetch changes up to 8ae3d0b50cd22aebcd87022dc357d1cf0f3a879b:

MAINTAINERS: Fix Zynq/ZynqMP and Microblaze fragments (2018-03-23 09:36:15 +0100)

---------------------------------------------------------------- Xilinx changes for v2018.05

- Fix mkimage recognition - Update all my fragments

ZynqMP: - Use clk driver - Support loading elfs in el1 - Various DTS and defconfig changes - Enable newer pmufw versions - Support more clocks - Remove ep108 - Secure image support - Fix memtest setup

Zynq: - Enabling watchdog driver - Support more clocks - defconfig changes

fpga: - Simplify error path

net: - GMII case update

---------------------------------------------------------------- Michal Simek (13): arm64: zynqmp: Convert board to use zynqmp-clk driver xilinx: Sync defconfigs with latest Kconfig updates fpga: Simplify error path in fpga_add arm64: zynqmp: Enable ethernet driver for zc1751-dc5 arm64: zynqmp: Enable newer pmufw versions clk: zynq: Show watchdog clock rate properly arm: zynq: Wire watchdog internals arm: zynq: Enable cadence driver on zc706 arm: zynq: Setup the same bootcommand as for zc770 xm011 x8 arm: zynq: Remove OF_EMBED configuration for zc770 xm011 x16 arm64: zynqmp: Remove ep108 board tools: xilinx: Fix zynq/zynqmp image recognition MAINTAINERS: Fix Zynq/ZynqMP and Microblaze fragments

Nitin Jain (1): arm64: zynqmp: Add support to load an app at EL1

Shreenidhi Shedi (1): watchdog: Add Cadence watchdog driver

Siva Durga Prasad Paladugu (4): arm: zynq: Enable debug uart on Zedboard net: zynq_gem: Dont run any phy detection logic for GMII case arm64: zynqmp: Correct EG/EV part detection logic arm64: zynqmp: Add support for verifying secure images

Vipul Kumar (3): arm64: zynqmp: Changed scratch address used by the alternate memory test arm64: zynqmp: nand: Fixed NAND erase issue for size 1GiB or more arm64: zynqmp: Print the value of pl clocks and wdt clock using clk dump

MAINTAINERS | 52 ++++++++++++++-- arch/arm/Kconfig | 2 + arch/arm/cpu/armv8/zynqmp/cpu.c | 2 +- arch/arm/dts/Makefile | 1 - arch/arm/dts/zynq-zc706.dts | 4 ++ arch/arm/dts/zynqmp-clk-ccf.dtsi | 290 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/zynqmp-ep108-clk.dtsi | 172 ---------------------------------------------------- arch/arm/dts/zynqmp-ep108.dts | 235 ---------------------------------------------------------------------- arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts | 2 +- arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts | 2 +- arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts | 2 +- arch/arm/dts/zynqmp-zc1751-xm019-dc5.dts | 2 +- arch/arm/dts/zynqmp-zcu102-revA.dts | 2 +- arch/arm/include/asm/arch-zynqmp/sys_proto.h | 2 + board/xilinx/zynq/MAINTAINERS | 1 + board/xilinx/zynq/board.c | 49 +++++++++++++++ board/xilinx/zynqmp/Kconfig | 18 ++++++ board/xilinx/zynqmp/MAINTAINERS | 1 + board/xilinx/zynqmp/Makefile | 4 ++ board/xilinx/zynqmp/cmds.c | 105 ++++++++++++++++++++++++++++++++ board/xilinx/zynqmp/zynqmp.c | 67 ++++++++++++++++---- configs/microblaze-generic_defconfig | 2 +- configs/syzygy_hub_defconfig | 2 +- configs/topic_miami_defconfig | 2 +- configs/topic_miamilite_defconfig | 2 +- configs/topic_miamiplus_defconfig | 2 +- configs/xilinx_zynqmp_ep_defconfig | 102 ------------------------------- configs/xilinx_zynqmp_mini_emmc_defconfig | 1 + configs/xilinx_zynqmp_mini_nand_defconfig | 1 + configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 3 +- configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 3 +- configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 3 +- configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 5 +- configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 3 +- configs/xilinx_zynqmp_zcu102_revA_defconfig | 3 +- configs/xilinx_zynqmp_zcu102_revB_defconfig | 3 +- configs/zynq_cc108_defconfig | 2 +- configs/zynq_cse_qspi_defconfig | 2 +- configs/zynq_microzed_defconfig | 2 +- configs/zynq_picozed_defconfig | 2 +- configs/zynq_z_turn_defconfig | 2 +- configs/zynq_zc702_defconfig | 2 +- configs/zynq_zc706_defconfig | 4 +- configs/zynq_zc770_xm010_defconfig | 2 +- configs/zynq_zc770_xm011_defconfig | 2 +- configs/zynq_zc770_xm011_x16_defconfig | 5 +- configs/zynq_zc770_xm012_defconfig | 2 +- configs/zynq_zc770_xm013_defconfig | 2 +- configs/zynq_zed_defconfig | 6 +- configs/zynq_zybo_defconfig | 2 +- drivers/clk/clk_zynq.c | 2 +- drivers/clk/clk_zynqmp.c | 75 +++++++++++++++++++++++ drivers/fpga/fpga.c | 21 ++++--- drivers/mtd/nand/arasan_nfc.c | 7 ++- drivers/net/zynq_gem.c | 3 +- drivers/watchdog/Kconfig | 16 +++++ drivers/watchdog/Makefile | 1 + drivers/watchdog/cdns_wdt.c | 276 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ include/command.h | 2 + include/configs/xilinx_zynqmp.h | 4 +- include/configs/xilinx_zynqmp_ep.h | 24 -------- include/configs/xilinx_zynqmp_mini.h | 2 + tools/zynqimage.c | 6 ++ tools/zynqmpimage.c | 2 +- 64 files changed, 1030 insertions(+), 600 deletions(-) create mode 100644 arch/arm/dts/zynqmp-clk-ccf.dtsi delete mode 100644 arch/arm/dts/zynqmp-ep108-clk.dtsi delete mode 100644 arch/arm/dts/zynqmp-ep108.dts create mode 100644 board/xilinx/zynqmp/Kconfig create mode 100644 board/xilinx/zynqmp/cmds.c delete mode 100644 configs/xilinx_zynqmp_ep_defconfig create mode 100644 drivers/watchdog/cdns_wdt.c delete mode 100644 include/configs/xilinx_zynqmp_ep.h