From: Tom Rini Date: Fri, 12 Apr 2019 16:34:44 +0000 (-0400) Subject: Merge git://git.denx.de/u-boot-marvell X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=066cc7c6cf8bb4fcf2a372e7c19c12fdec0868e7;p=project%2Fbcm63xx%2Fu-boot.git Merge git://git.denx.de/u-boot-marvell - 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) --- 066cc7c6cf8bb4fcf2a372e7c19c12fdec0868e7 diff --cc board/Marvell/db-xc3-24g4xg/MAINTAINERS index 0000000000,94d4a90178..2b27e48181 mode 000000,100644..100644 --- a/board/Marvell/db-xc3-24g4xg/MAINTAINERS +++ b/board/Marvell/db-xc3-24g4xg/MAINTAINERS @@@ -1,0 -1,7 +1,7 @@@ + DB-XC3-24G4XG BOARD + M: Chris Packham + S: Maintained + F: board/Marvell/db-xc3-24g4xg/ + F: include/configs/db-xc3-24g4xg.h -F: configs/db-xc3-24g4xg-amc_defconfig ++F: configs/db-xc3-24g4xg_defconfig + F: arch/arm/dts/armada-xp-db-xc3-24g4xg.dts