Hi Tom, please pull the following Marvell related patches. I've removed the board support, causing the out-of-tree building error for now. I'll push this one after its resolved.
---------------------------------------------------------------- - Misc dts files sync'ed with Linux version (Chris) - Orion watchdog fix (Chris) - kwbimage changed to also support Marvell bin_hdr binary (Chris) - Add DM support to enable CONFIG_BLK for sata_mv (Stefan) - Enable BLK on multiple platforms (Stefan) - Misc minor fixes to AXP theadorable board (Stefan) - Correct logic for DM_SCSI + unconverted drivers check (stefan) - Misc changes to kirkwood to enable DM_USB here (Chris) - Change ahci_mvebu to enable usage on A38x (Baruch) - Update the kirkwood entry in git-mailrc (Baruch) - Misc minor improvements (turris, documentation) (Baruch) - Enhance sata_mv to support Kirkwood as well (Michael) - Add wdt command (Michael) - Add Marvell integrated CPUs (MSYS) support with DB-XC3-24G4XG board support (Chris) ---------------------------------------------------------------- Travis build is quite fine now [1], only showing a problem with "Check for configs without MAINTAINERS entry". I've not seen this error before. Frankly, I'm in a bit of a hurry, as I am leaving for a 10 days vacation tomorrow and this will be my last try to get these Marvell patches upstream before it. [1] https://travis-ci.org/stroese/u-boot/builds/519095642 Thanks, Stefan The following changes since commit 02f173ca156cee8526dff87603d5e446b443cde3: Merge branch 'master' of git://git.denx.de/u-boot-usb (2019-04-11 14:29:37 -0400) are available in the Git repository at: git://www.denx.de/git/u-boot-marvell.git for you to fetch changes up to 937cb9d0a671b1df01955edd515ebf4a65e45f85: ARM: mvebu: sync db-88f6820-amc.dts with Linux v5.0 (2019-04-12 07:20:20 +0200) ---------------------------------------------------------------- Baruch Siach (6): ARM: mvebu: define board_ahci_enable() for A38x ata: ahci_mvebu: add support for Armada 38x git-mailrc: update the kirkwood entry arm: mvebu: clearfog: document eMMC installation mvebu: drop dangling SPI flash comments and #ifdefs arm: mvebu: turris_omnia: select Kconfig SPI_FLASH_SPANSION Chris Packham (20): arm: sync armada-xp dts files from Linux 5.0 watchdog: orion_wdt: support SPL usage watchdog: orion_wdt: take timeout value in ms arm: mvebu: x530: Enable watchdog in SPL and U-Boot tools: kwbimage: don't adjust for image_header for Armada MSYS ARM: kirkwood: rename KW_CPU_WIN_BASE to MVEBU_CPU_WIN_BASE ARM: kirkwood: remove KW_DEFADR_PCI_IO_REMAP ARM: kirkwood: switch to using mvebu mbus ARM: kirkwood: remove kw_config_adr_windows ARM: kirkwood: enable CONFIG_DM_USB for {dream, guru, sheeva}plug ARM: kirkwood: enable CONFIG_DM_USB for dns325 ARM: kirkwood: enable CONFIG_DM_USB for ds109 ARM: kirkwood: enable CONFIG_DM_USB for goflexhome ARM: kirkwood: enable CONFIG_DM_USB for lschlv2 and lsxhl ARM: kirkwood: enable CONFIG_DM_USB for nas220 arm: mvebu: Add Marvell's integrated CPUs arm: mvebu: NAND clock support for MSYS devices arm: mvebu: Add DB-XC3-24G4XG board ARM: mvebu: rename armada-385-amc.dts to armada-385-db-88f6820-amc.dts ARM: mvebu: sync db-88f6820-amc.dts with Linux v5.0 Leigh Brown (1): ARM: kirkwood: remove obsolete call to icache_enable Michael Walle (5): sata: sata_mv: use correct format specifier in debug() sata: sata_mv: support kirkwood architecture sata: sata_mv: add orion-sata compatible string arm: kirkwood: lsxl: enable DM for SATA cmd: add wdt command Stefan Roese (8): sata: sata_mv: Add DM support to enable CONFIG_BLK usage arm: mvebu: theadorable_debug_defconfig: Enable CONFIG_BLK arm: mvebu: db-mv784mp-gp_defconfig: Enable CONFIG_BLK arm: mvebu: theadorable: Add test for ctrl-c in PCIe PEX switch test Makefile: Correct logic for DM_SCSI + unconverted drivers check arm: mvebu: ds412: Enable CONFIG_BLK arm: mvebu: AXP: Enhance PCIe port capability configuration arm: mvebu: Fix Kconfig dependency warnings Makefile | 19 +- arch/arm/dts/Makefile | 5 +- arch/arm/dts/armada-370-xp.dtsi | 133 ++++---- arch/arm/dts/armada-385-amc.dts | 166 ---------- arch/arm/dts/armada-385-atl-x530-u-boot.dtsi | 4 + arch/arm/dts/armada-385-db-88f6820-amc.dts | 146 +++++++++ arch/arm/dts/armada-xp-98dx3236.dtsi | 343 ++++++++++++++++++++ arch/arm/dts/armada-xp-98dx3336.dtsi | 39 +++ arch/arm/dts/armada-xp-98dx4251.dtsi | 54 ++++ arch/arm/dts/armada-xp-db-xc3-24g4xg-u-boot.dtsi | 24 ++ arch/arm/dts/armada-xp-db-xc3-24g4xg.dts | 110 +++++++ arch/arm/dts/armada-xp-gp.dts | 167 +++++----- arch/arm/dts/armada-xp-maxbcm.dts | 24 +- arch/arm/dts/armada-xp-mv78230.dtsi | 55 +--- arch/arm/dts/armada-xp-mv78260.dtsi | 58 +--- arch/arm/dts/armada-xp-mv78460.dtsi | 58 +--- arch/arm/dts/armada-xp-synology-ds414.dts | 199 ++++++------ arch/arm/dts/armada-xp-theadorable.dts | 69 ++-- arch/arm/dts/armada-xp.dtsi | 214 +++++++------ arch/arm/mach-kirkwood/cpu.c | 74 ++--- arch/arm/mach-kirkwood/include/mach/cpu.h | 13 +- arch/arm/mach-kirkwood/include/mach/soc.h | 2 +- arch/arm/mach-mvebu/Kconfig | 34 +- arch/arm/mach-mvebu/Makefile | 2 + arch/arm/mach-mvebu/cpu.c | 46 ++- arch/arm/mach-mvebu/include/mach/config.h | 2 +- arch/arm/mach-mvebu/include/mach/cpu.h | 3 + arch/arm/mach-mvebu/include/mach/soc.h | 31 ++ arch/arm/mach-mvebu/mbus.c | 9 + .../arm/mach-mvebu/serdes/axp/high_speed_env_lib.c | 8 +- board/CZ.NIC/turris_omnia/turris_omnia.c | 2 +- board/Marvell/db-xc3-24g4xg/.gitignore | 1 + board/Marvell/db-xc3-24g4xg/MAINTAINERS | 7 + board/Marvell/db-xc3-24g4xg/Makefile | 14 + board/Marvell/db-xc3-24g4xg/README | 4 + board/Marvell/db-xc3-24g4xg/binary.0 | 11 + board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c | 68 ++++ board/Marvell/db-xc3-24g4xg/kwbimage.cfg.in | 12 + board/Synology/ds414/ds414.c | 4 +- board/alliedtelesis/x530/x530.c | 48 +++ board/maxbcm/maxbcm.c | 2 +- board/solidrun/clearfog/README | 23 ++ board/theadorable/theadorable.c | 38 ++- cmd/Kconfig | 6 + cmd/Makefile | 1 + cmd/wdt.c | 174 ++++++++++ configs/db-88f6820-amc_defconfig | 2 +- configs/db-mv784mp-gp_defconfig | 1 + configs/db-xc3-24g4xg_defconfig | 55 ++++ configs/dns325_defconfig | 2 + configs/dreamplug_defconfig | 2 + configs/ds109_defconfig | 2 + configs/ds414_defconfig | 1 + configs/goflexhome_defconfig | 2 + configs/guruplug_defconfig | 2 + configs/lschlv2_defconfig | 6 +- configs/lsxhl_defconfig | 6 +- configs/nas220_defconfig | 2 + configs/sheevaplug_defconfig | 1 + configs/theadorable_debug_defconfig | 1 + configs/turris_omnia_defconfig | 1 + configs/x530_defconfig | 5 + doc/git-mailrc | 4 +- drivers/ata/Kconfig | 2 + drivers/ata/ahci_mvebu.c | 1 + drivers/ata/sata_mv.c | 354 ++++++++++++--------- drivers/ddr/marvell/axp/xor_regs.h | 4 + drivers/watchdog/Kconfig | 1 + drivers/watchdog/orion_wdt.c | 27 +- include/configs/clearfog.h | 2 - include/configs/db-88f6720.h | 2 - include/configs/db-88f6820-amc.h | 2 - include/configs/db-88f6820-gp.h | 6 - include/configs/db-mv784mp-gp.h | 2 - include/configs/db-xc3-24g4xg.h | 41 +++ include/configs/ds414.h | 2 - include/configs/helios4.h | 2 - include/configs/lsxl.h | 23 +- include/configs/mvebu_armada-8k.h | 4 - include/configs/theadorable.h | 2 - include/configs/turris_mox.h | 4 - include/configs/turris_omnia.h | 3 - tools/kwbimage.c | 7 + 83 files changed, 2102 insertions(+), 1010 deletions(-) delete mode 100644 arch/arm/dts/armada-385-amc.dts create mode 100644 arch/arm/dts/armada-385-db-88f6820-amc.dts create mode 100644 arch/arm/dts/armada-xp-98dx3236.dtsi create mode 100644 arch/arm/dts/armada-xp-98dx3336.dtsi create mode 100644 arch/arm/dts/armada-xp-98dx4251.dtsi create mode 100644 arch/arm/dts/armada-xp-db-xc3-24g4xg-u-boot.dtsi create mode 100644 arch/arm/dts/armada-xp-db-xc3-24g4xg.dts create mode 100644 board/Marvell/db-xc3-24g4xg/.gitignore create mode 100644 board/Marvell/db-xc3-24g4xg/MAINTAINERS create mode 100644 board/Marvell/db-xc3-24g4xg/Makefile create mode 100644 board/Marvell/db-xc3-24g4xg/README create mode 100644 board/Marvell/db-xc3-24g4xg/binary.0 create mode 100644 board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c create mode 100644 board/Marvell/db-xc3-24g4xg/kwbimage.cfg.in create mode 100644 cmd/wdt.c create mode 100644 configs/db-xc3-24g4xg_defconfig create mode 100644 include/configs/db-xc3-24g4xg.h _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
