From: Tom Rini <trini@konsulko.com>
Date: Thu, 26 Jan 2017 17:26:24 +0000 (-0500)
Subject: Merge git://www.denx.de/git/u-boot-marvell
X-Git-Tag: v2017.03-rc1~41
X-Git-Url: https://git.librecmc.org/?p=oweals%2Fu-boot.git;a=commitdiff_plain;h=cf4128e53caa4f7b0a6586fc3f10690d5c05db31

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

cf4128e53caa4f7b0a6586fc3f10690d5c05db31
diff --cc configs/mvebu_db-88f3720_defconfig
index 8b5229cc67,a6fce93e3c..7d97e11a1c
--- a/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