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

[u-boot] / configs / smdkc100_defconfig

diff --git a/configs/smdkc100_defconfig b/configs/smdkc100_defconfig
index e933a329b62e00ae9dc0fdece52bd9a9da3a9d27..0948534e89be5bfbe09e17aa1fc84765285d66c2 100644 (file)
--- a/configs/smdkc100_defconfig
+++ b/configs/smdkc100_defconfig
@@ -1,6 +1,12 @@
 CONFIG_ARM=y
-CONFIG_TARGET_SMDKC100=y
 CONFIG_ARCH_S5PC1XX=y
+CONFIG_TARGET_SMDKC100=y
 CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-smdkc100"
-CONFIG_SYS_MALLOC_F=y
-CONFIG_SYS_MALLOC_F_LEN=0x400
+CONFIG_BOOTDELAY=3
+CONFIG_HUSH_PARSER=y
+CONFIG_SYS_PROMPT="SMDKC100 # "
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_CACHE=y
+CONFIG_CMD_FAT=y