Merge git://git.denx.de/u-boot-fsl-qoriq

[u-boot] / configs / adp-ae3xx_defconfig

diff --git a/configs/adp-ae3xx_defconfig b/configs/adp-ae3xx_defconfig
index 600566955a3fbf225c51b57aa0db3a79950f4bb1..34c798a6b98a7bf7f9f97f2a96408c11eae25194 100644 (file)
--- a/configs/adp-ae3xx_defconfig
+++ b/configs/adp-ae3xx_defconfig
@@ -21,15 +21,15 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_MMC=y
+CONFIG_DM_MMC=y
+CONFIG_MMC_NDS32=y
+CONFIG_FTSDC010=y
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_CFI_FLASH=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_DM_MMC=y
-CONFIG_MMC_NDS32=y
-CONFIG_FTSDC010=y
 CONFIG_DM_ETH=y
 CONFIG_FTMAC100=y
 CONFIG_BAUDRATE=38400
@@ -39,3 +39,5 @@ CONFIG_DM_SPI=y
 CONFIG_ATCSPI200_SPI=y
 CONFIG_TIMER=y
 CONFIG_ATCPIT100_TIMER=y
+CONFIG_PANIC_HANG=y
+CONFIG_SYS_TEXT_BASE=0x4A000000