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

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

diff --git a/configs/calimain_defconfig b/configs/calimain_defconfig
index a808ddf28f878dcf4c83a02bbdce438d0e7c0f39..89c9e9c9fb775a24bdeaa5a76d1e4846d93eb3ac 100644 (file)
--- a/configs/calimain_defconfig
+++ b/configs/calimain_defconfig
@@ -1,2 +1,23 @@
 CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_CALIMAIN=y
+CONFIG_BOOTDELAY=0
+CONFIG_VERSION_VARIABLE=y
+# CONFIG_DISPLAY_CPUINFO is not set
+# CONFIG_DISPLAY_BOARDINFO is not set
+CONFIG_HUSH_PARSER=y
+CONFIG_SYS_PROMPT="Calimain > "
+CONFIG_AUTOBOOT_KEYED=y
+CONFIG_AUTOBOOT_STOP_STR="\x0b"
+CONFIG_CMD_ASKENV=y
+CONFIG_CRC32_VERIFY=y
+CONFIG_CMD_GPIO=y
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_DHCP=y
+CONFIG_CMD_MII=y
+CONFIG_CMD_PING=y
+CONFIG_CMD_DIAG=y
+CONFIG_ENV_IS_IN_FLASH=y
+# CONFIG_MMC is not set
+CONFIG_MTD_NOR_FLASH=y
+CONFIG_SYS_NS16550=y