Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / configs / adp-ae3xx_defconfig

diff --git a/configs/adp-ae3xx_defconfig b/configs/adp-ae3xx_defconfig
index b264f4dd2936db17331824f2dbb938f375d298ea..553ebc84a851bd53aa554f69b0c4277ae5494d6f 100644 (file)
--- a/configs/adp-ae3xx_defconfig
+++ b/configs/adp-ae3xx_defconfig
@@ -1,8 +1,10 @@
 CONFIG_NDS32=y
+CONFIG_SYS_TEXT_BASE=0x4A000000
 CONFIG_TARGET_ADP_AE3XX=y
 CONFIG_DEFAULT_DEVICE_TREE="ae3xx"
 CONFIG_FIT=y
 CONFIG_BOOTDELAY=3
+# CONFIG_AUTO_COMPLETE is not set
 CONFIG_SYS_PROMPT="NDS32 # "
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_MMC=y
@@ -22,8 +24,8 @@ CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_MMC=y
 CONFIG_DM_MMC=y
-CONFIG_MMC_NDS32=y
 CONFIG_FTSDC010=y
+CONFIG_FTSDC010_SDIO=y
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_CFI_FLASH=y
@@ -35,6 +37,7 @@ CONFIG_FTMAC100=y
 CONFIG_BAUDRATE=38400
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
+CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_ATCSPI200_SPI=y
 CONFIG_TIMER=y