Merge git://git.denx.de/u-boot-dm

[people/ms/u-boot.git] / configs / mx31pdk_defconfig

diff --git a/configs/mx31pdk_defconfig b/configs/mx31pdk_defconfig
index 26cd87e3848ec472c5534989842668e155d23e3b..2b70da564e8610e0eeab73d6efdd796f41148a52 100644 (file)
--- a/configs/mx31pdk_defconfig
+++ b/configs/mx31pdk_defconfig
@@ -1,3 +1,20 @@
+CONFIG_ARM=y
+# CONFIG_SPL_USE_ARCH_MEMCPY is not set
+# CONFIG_SPL_USE_ARCH_MEMSET is not set
+CONFIG_TARGET_MX31PDK=y
+CONFIG_SPL_LIBGENERIC_SUPPORT=y
+CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_NAND_SUPPORT=y
+CONFIG_BOOTDELAY=1
 CONFIG_SPL=y
-+S:CONFIG_ARM=y
-+S:CONFIG_TARGET_MX31PDK=y
+CONFIG_CMD_BOOTZ=y
+# CONFIG_CMD_IMLS is not set
+CONFIG_CMD_NAND=y
+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_MMC is not set