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

[u-boot] / configs / mx31pdk_defconfig

diff --git a/configs/mx31pdk_defconfig b/configs/mx31pdk_defconfig
index a31ad5b02a6e8b424b30b88495b6d8bc28d22003..771cf72fe55b05ac6377c8acdd0d95c2f250be6c 100644 (file)
--- a/configs/mx31pdk_defconfig
+++ b/configs/mx31pdk_defconfig
@@ -1,14 +1,30 @@
 CONFIG_ARM=y
-CONFIG_TARGET_MX31PDK=y
+# CONFIG_SPL_USE_ARCH_MEMCPY is not set
+# CONFIG_SPL_USE_ARCH_MEMSET is not set
+CONFIG_ARCH_MX31=y
+CONFIG_SYS_TEXT_BASE=0x87e00000
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
-CONFIG_SPL_NAND_SUPPORT=y
+CONFIG_TARGET_MX31PDK=y
 CONFIG_SPL_SERIAL_SUPPORT=y
-CONFIG_BOOTDELAY=1
 CONFIG_SPL=y
+# CONFIG_SPL_FRAMEWORK is not set
+CONFIG_SPL_NAND_SUPPORT=y
+# CONFIG_AUTO_COMPLETE is not set
 CONFIG_CMD_BOOTZ=y
-# CONFIG_CMD_IMLS is not set
 CONFIG_CMD_SPI=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
+CONFIG_CMD_DATE=y
+CONFIG_ENV_IS_IN_NAND=y
+CONFIG_MXC_GPIO=y
+# CONFIG_MMC is not set
+CONFIG_NAND=y
+CONFIG_NAND_MXC=y
+CONFIG_NETDEVICES=y
+CONFIG_SMC911X=y
+CONFIG_SMC911X_BASE=0xB6000000
+CONFIG_SMC911X_32_BIT=y
+CONFIG_SPI=y
+CONFIG_MXC_SPI=y