Merge git://www.denx.de/git/u-boot-marvell

diff --cc configs/mvebu_db-88f3720_defconfig
index 8b5229cc677e73f1b7443c3deaf99efc068f0331,a6fce93e3c4235312074168dce9512a5208f71d3..7d97e11a1c3e676247703766f52874d3c1605402
--- 1/configs/mvebu_db-88f3720_defconfig
--- 2/configs/mvebu_db-88f3720_defconfig
+++ b/configs/mvebu_db-88f3720_defconfig
@@@ -9,10 -8,9 +8,11 @@@ CONFIG_AHCI=
  CONFIG_SYS_CONSOLE_INFO_QUIET=y
  # CONFIG_DISPLAY_CPUINFO is not set
  # CONFIG_DISPLAY_BOARDINFO is not set
 +CONFIG_ARCH_EARLY_INIT_R=y
 +CONFIG_BOARD_EARLY_INIT_F=y
  # CONFIG_CMD_IMLS is not set
  # CONFIG_CMD_FLASH is not set
+ CONFIG_CMD_MMC=y
  CONFIG_CMD_SF=y
  CONFIG_CMD_SPI=y
  CONFIG_CMD_I2C=y

diff --cc configs/mvebu_db-88f7040_defconfig
Simple merge

diff --cc configs/mvebu_db-88f8040_defconfig
Simple merge

diff --cc include/configs/mvebu_armada-8k.h
Simple merge

diff --cc include/configs/mvebu_db-88f3720.h
Simple merge