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

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

diff --git a/configs/zmx25_defconfig b/configs/zmx25_defconfig
index 80a66d03fdf761b82295d8018547aa782c4eb822..f85330816110b952fbf55e8aae8744a635ff9c2f 100644 (file)
--- a/configs/zmx25_defconfig
+++ b/configs/zmx25_defconfig
@@ -1,2 +1,8 @@
 CONFIG_ARM=y
 CONFIG_TARGET_ZMX25=y
+CONFIG_SYS_PROMPT="zmx25> "
+CONFIG_AUTOBOOT_KEYED=y
+CONFIG_AUTOBOOT_PROMPT="boot in %d s\n"
+CONFIG_AUTOBOOT_DELAY_STR="delaygs"
+CONFIG_AUTOBOOT_STOP_STR="stopgs"
+# CONFIG_CMD_SETEXPR is not set