Merge branch 'master' of git://git.denx.de/u-boot-marvell
- defconfig updates to remove the DM-move build warnings for helios4 and
controlcenterdc (Mario & Stefan)
diff --git a/configs/controlcenterdc_defconfig b/configs/controlcenterdc_defconfig
index 7b94f22..326668d 100644
--- a/configs/controlcenterdc_defconfig
+++ b/configs/controlcenterdc_defconfig
@@ -12,6 +12,7 @@
CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI_SUPPORT=y
CONFIG_DEBUG_UART=y
+CONFIG_AHCI=y
CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y
@@ -55,6 +56,7 @@
CONFIG_SYS_I2C_MVTWSI=y
CONFIG_LED=y
CONFIG_LED_GPIO=y
+CONFIG_DM_MMC=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_MV=y
CONFIG_SPI_FLASH=y
diff --git a/configs/helios4_defconfig b/configs/helios4_defconfig
index 62c2979..3b1737b 100644
--- a/configs/helios4_defconfig
+++ b/configs/helios4_defconfig
@@ -44,6 +44,7 @@
CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
CONFIG_I2C_DEFAULT_BUS_NUMBER=0x1
CONFIG_SYS_I2C_MVTWSI=y
+CONFIG_DM_MMC=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_SDMA=y
CONFIG_MMC_SDHCI_MV=y