Hi Tom, please pull these changes to your tree. Buildman and travis looks good https://travis-ci.org/michalsimek/u-boot/builds/405716862
My pull request contains some change out of xilinx folders because one function name has been changed. I got a confirmation from Marek to go with this to the tree. And also some small changes in common area which were reviewed. usb_kdb is an exception because probably none cares. You can find more details below. Thanks, Michal The following changes since commit 1adbf2966adebe67de3dd17094749d387604194e: Merge branch 'master' of git://git.denx.de/u-boot-sunxi (2018-07-17 14:28:47 -0400) are available in the git repository at: git://www.denx.de/git/u-boot-microblaze.git tags/xilinx-for-v2018.09 for you to fetch changes up to 577012da71ea9dcf07272c7f458218aa8ab29984: arm: zynq: spl: fix FPGA initialization (2018-07-19 10:49:57 +0200) ---------------------------------------------------------------- Xilinx changes for v2018.09 clk: - Fix zynqmp clock driver common: - Handle CMD_RET_USAGE in cmd_process_error - Use return macros in cmd_process_error - Fix duplication of CONFIG_SYS_PROMPT_HUSH_PS2 - Support watchdog in usb_kbd.c - Fix name usage in usb_kbd.c - Support systems with non zero memory start initialized from DT only gpio: - Add support for manual relocation in uclass - zynq - use live tree - zynq - fix match data reading - zynq - setup bank name - xilinx - convert driver to DM microblaze: - Use generic iounmap/ioremap implementations - Redesign reset logic with sysreset features - Use watchdog and gpio over DM - Remove unused macros and fix some checkpatch issues - Fix timer initialization not to be called twice serial: - zynq - Use platdata intead of priv data sysreset: - Add support for manual relocation in uclass - Add gpio-restart driver - Add microblaze soft reset driver watchdog: - Add support for aliases in uclass - Add support for manual relocation in uclass - Convert xilinx driver to DM - cadence - update info in the driver and not stop wdt in probe xilinx: - Enable LED gpio for some targets with gpio-leds DT node - Setup variables via Kconfig zynq: - Add support for watchdog aliases - Add support for mini nand/nor configurations - Wire FPGA initalization in SPL zynqmp: - Enable mass storage for zcu100 - Handle external pmufw files - Add support for secure images - Some Kconfig movements and alignments - Add support for watchdog aliases - Use subcommands style for platform command - Add mmio_read/write platform commands - DT updates - Add support for mini qspi configuration ---------------------------------------------------------------- Luca Ceresoli (1): arm/arm64: zynq/zynqmp: pass the PS init file as a kconfig variable Luis Araneda (3): spl: fit: display a message when an FPGA image is loaded drivers: fpga: zynqpl: fix compilation with SPL arm: zynq: spl: fix FPGA initialization Michal Simek (36): gpio: zynq: Use live-tree function arm64: zynqmp: Enable usb mass storage command and functionality common: command: Use command_ret_t enum values instead of values common: command: Handle USAGE failure separately hush: Remove default CONFIG_SYS_PROMPT_HUSH_PS2 setting from board files usb_kbd: Add support for watchdog usb_kdb: Get stdio_dev directly from sdev pointer serial: zynq: Use platdata for storing static data instead of priv microblaze: Use default implementation from include/linux/io.h microblaze: Guard do_reset by CONFIG_SYSRESET arm64: zcu100: Enable USB host ether and ASIX via defconfig watchdog: dm: Change uclass name to watchdog and enable DM_UC_FLAG_SEQ_ALIAS watchdog: dm: Support manual relocation for watchdogs arm64: zynqmp: Sync defconfigs in connection to DEFINE_TCM_OCM_MMAP microblaze: Remove unused XILINX_BOARD_NAME macro gpio: zynq: Fix typo in one error message sysreset: dm: Support manual relocation for sysreset gpio: dm: Support manual relocation for gpio gpio: zynq: Read of mach data in platdata with dev_get_driver_data microblaze: Do not call timer init that early gpio: zynq: Setup bank_name to dev->name arm64: zynqmp: Try to enable the first watchdog via aliases arm: zynq: Try to enable the first watchdog via aliases sysreset: Add support for gpio-restart sysreset: Add support for Microblaze soft reset jump gpio: xilinx: Convert driver to DM microblaze: Enable watchdog via defconfig arm64: xilinx: Setup default number of chipselects for zcu100 microblaze: Convert generic platform to DM gpio microblaze: Do not force saving variables to flash watchdog: cdns: Add comment for expire_now function xilinx: Enable led support for some boards watchdog: cadence: Do not stop wdt in probe microblaze: Remove XILINX_SPI_FLASH_BASEADDR logic arm: zynq: Setup ENV_SIZE via Kconfig arm64: zynqmp: Setup ENV_SIZE via Kconfig for mini targets Shreenidhi Shedi (4): microblaze: Cosmetic changes in Microblaze related files microblaze: Delete Xilinx watchdog related macros microblaze: Support for watchdog_reset in init watchdog: Convert Xilinx Axi watchdog driver to driver model Siva Durga Prasad Paladugu (7): xilinx: zynq: Add support to secure images lib: fdtdec: Update ram_base to store ram start adddress lib: fdtdec: Rename routine fdtdec_setup_memory_size() arm: zynq: Dont define SDRAM_BASE and SDRAM_SIZE in .h arm: zynq: Add Nand flash mini u-boot configuration for zynq arm: zynq: Add parallel NOR flash mini u-boot configuration for zynq arm64: zynqmp: Add QSPI flash mini u-boot configuration Vipul Kumar (4): clk: zynqmp: Fixed the same if/else part error reported by coverity arm64: zynqmp: Changed zynqmp command to handle subcommands with U_BOOT_CMD_MKENT arm64: zynqmp: Added support of mmio read and write commands env: Added support to save env to spi through Kconfig MAINTAINERS | 1 + arch/arm/Kconfig | 2 + arch/arm/dts/Makefile | 3 + arch/arm/dts/zynq-cse-nand.dts | 80 ++++++++++++++++++++ arch/arm/dts/zynq-cse-nor.dts | 88 +++++++++++++++++++++ arch/arm/dts/zynqmp-mini-qspi.dts | 79 +++++++++++++++++++ arch/arm/dts/zynqmp-zcu100-revC.dts | 2 + arch/arm/mach-mvebu/arm64-common.c | 2 +- arch/arm/mach-socfpga/misc.c | 2 +- arch/arm/mach-zynq/include/mach/hardware.h | 1 + arch/arm/mach-zynq/spl.c | 3 + arch/microblaze/Kconfig | 2 +- arch/microblaze/cpu/spl.c | 8 ++ arch/microblaze/cpu/timer.c | 4 + arch/microblaze/include/asm/gpio.h | 13 ---- arch/microblaze/include/asm/io.h | 97 +++++++++++++----------- board/broadcom/bcmstb/bcmstb.c | 2 +- board/emulation/qemu-arm/qemu-arm.c | 2 +- board/renesas/alt/alt.c | 2 +- board/renesas/blanche/blanche.c | 2 +- board/renesas/draak/draak.c | 2 +- board/renesas/eagle/eagle.c | 2 +- board/renesas/ebisu/ebisu.c | 2 +- board/renesas/gose/gose.c | 2 +- board/renesas/koelsch/koelsch.c | 2 +- board/renesas/lager/lager.c | 2 +- board/renesas/porter/porter.c | 2 +- board/renesas/salvator-x/salvator-x.c | 2 +- board/renesas/silk/silk.c | 2 +- board/renesas/stout/stout.c | 2 +- board/renesas/ulcb/ulcb.c | 2 +- board/st/stm32f429-discovery/stm32f429-discovery.c | 2 +- board/st/stm32f429-evaluation/stm32f429-evaluation.c | 2 +- board/st/stm32f469-discovery/stm32f469-discovery.c | 2 +- board/st/stm32h743-disco/stm32h743-disco.c | 2 +- board/st/stm32h743-eval/stm32h743-eval.c | 2 +- board/xilinx/Kconfig | 41 ++++++++++ board/xilinx/microblaze-generic/microblaze-generic.c | 81 ++++++++++++-------- board/xilinx/microblaze-generic/xparameters.h | 9 --- board/xilinx/zynq/Kconfig | 33 ++++++++ board/xilinx/zynq/Makefile | 15 +++- board/xilinx/zynq/board.c | 16 ++-- board/xilinx/zynq/bootimg.c | 143 +++++++++++++++++++++++++++++++++++ board/xilinx/zynq/cmds.c | 513 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/xilinx/zynqmp/Makefile | 10 ++- board/xilinx/zynqmp/cmds.c | 113 +++++++++++++++++++-------- board/xilinx/zynqmp/zynqmp.c | 16 ++-- board/xilinx/zynqmp_r5/board.c | 2 +- common/board_f.c | 4 +- common/command.c | 7 +- common/spl/spl_fit.c | 1 + common/usb_kbd.c | 9 ++- configs/bitmain_antminer_s9_defconfig | 1 + configs/microblaze-generic_defconfig | 7 ++ 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_qspi_defconfig | 62 +++++++++++++++ configs/xilinx_zynqmp_zc1232_revA_defconfig | 1 - configs/xilinx_zynqmp_zc1254_revA_defconfig | 1 - configs/xilinx_zynqmp_zc1275_revA_defconfig | 1 - configs/xilinx_zynqmp_zc1275_revB_defconfig | 1 - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 - configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig | 1 - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 - configs/xilinx_zynqmp_zcu100_revC_defconfig | 6 +- configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 3 +- configs/xilinx_zynqmp_zcu102_revA_defconfig | 3 +- configs/xilinx_zynqmp_zcu102_revB_defconfig | 3 +- configs/xilinx_zynqmp_zcu104_revA_defconfig | 1 - configs/xilinx_zynqmp_zcu104_revC_defconfig | 1 - configs/xilinx_zynqmp_zcu106_revA_defconfig | 3 +- configs/xilinx_zynqmp_zcu111_revA_defconfig | 3 +- configs/zynq_cse_nand_defconfig | 48 ++++++++++++ configs/zynq_cse_nor_defconfig | 47 ++++++++++++ configs/zynq_cse_qspi_defconfig | 2 + configs/zynq_z_turn_defconfig | 2 + configs/zynq_zc702_defconfig | 2 + drivers/clk/clk_zynqmp.c | 6 +- drivers/fpga/zynqpl.c | 49 +++++++++++- drivers/gpio/Kconfig | 1 + drivers/gpio/gpio-uclass.c | 35 +++++++++ drivers/gpio/xilinx_gpio.c | 265 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- drivers/gpio/zynq_gpio.c | 33 ++------ drivers/serial/serial_zynq.c | 32 ++++---- drivers/sysreset/Kconfig | 14 ++++ drivers/sysreset/Makefile | 2 + drivers/sysreset/sysreset-uclass.c | 16 ++++ drivers/sysreset/sysreset_gpio.c | 59 +++++++++++++++ drivers/sysreset/sysreset_microblaze.c | 30 ++++++++ drivers/watchdog/Kconfig | 8 ++ drivers/watchdog/cdns_wdt.c | 3 +- drivers/watchdog/wdt-uclass.c | 26 ++++++- drivers/watchdog/xilinx_tb_wdt.c | 111 ++++++++++++++++++++------- env/Kconfig | 28 +++++++ include/command.h | 4 +- include/configs/bitmain_antminer_s9.h | 3 - include/configs/ls1021aiot.h | 2 - include/configs/ls1088a_common.h | 1 - include/configs/microblaze-generic.h | 24 +----- include/configs/s32v234evb.h | 1 - include/configs/tplink_wdr4300.h | 1 - include/configs/xilinx_zynqmp.h | 3 - include/configs/xilinx_zynqmp_mini.h | 1 - include/configs/xilinx_zynqmp_mini_emmc.h | 1 - include/configs/xilinx_zynqmp_mini_nand.h | 1 - include/configs/xilinx_zynqmp_mini_qspi.h | 20 +++++ include/configs/xilinx_zynqmp_zcu100.h | 3 - include/configs/zynq-common.h | 13 ---- include/configs/zynq_cse.h | 5 -- include/fdtdec.h | 16 ++-- include/u-boot/rsa-mod-exp.h | 4 + include/zynq_bootimg.h | 33 ++++++++ include/zynqpl.h | 4 + lib/fdtdec.c | 3 +- lib/rsa/rsa-mod-exp.c | 51 +++++++++++++ tools/patman/func_test.py | 2 +- tools/patman/test/0000-cover-letter.patch | 2 +- tools/patman/test/0002-fdt-Correct-cast-for-sandbox-in-fdtdec_setup_memory_.patch | 4 +- tools/patman/test/test01.txt | 2 +- 122 files changed, 2229 insertions(+), 339 deletions(-) create mode 100644 arch/arm/dts/zynq-cse-nand.dts create mode 100644 arch/arm/dts/zynq-cse-nor.dts create mode 100644 arch/arm/dts/zynqmp-mini-qspi.dts create mode 100644 board/xilinx/Kconfig create mode 100644 board/xilinx/zynq/Kconfig create mode 100644 board/xilinx/zynq/bootimg.c create mode 100644 board/xilinx/zynq/cmds.c create mode 100644 configs/xilinx_zynqmp_mini_qspi_defconfig create mode 100644 configs/zynq_cse_nand_defconfig create mode 100644 configs/zynq_cse_nor_defconfig create mode 100644 drivers/sysreset/sysreset_gpio.c create mode 100644 drivers/sysreset/sysreset_microblaze.c create mode 100644 include/configs/xilinx_zynqmp_mini_qspi.h create mode 100644 include/zynq_bootimg.h _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot