summaryrefslogtreecommitdiffstats
path: root/include/configs/gw8260.h
diff options
context:
space:
mode:
authorMarkus Klotzbuecher <mk@denx.de>2008-08-04 19:18:14 +0200
committerMarkus Klotzbuecher <mk@denx.de>2008-08-04 19:18:14 +0200
commit0f2b5d8ec0969a5b0992f5031bf3c61117a41d59 (patch)
treefc05bf5db93e5a9c1712d24a5efdff94685063c2 /include/configs/gw8260.h
parentab06bddb04ed4be50a8f9ad5f94fa23953a734e3 (diff)
parent81091f58f0c58ecd26c5b05de2ae20ca6cdb521c (diff)
downloadtalos-obmc-uboot-0f2b5d8ec0969a5b0992f5031bf3c61117a41d59.tar.gz
talos-obmc-uboot-0f2b5d8ec0969a5b0992f5031bf3c61117a41d59.zip
Merge branch 'master' of git://www.denx.de/git/u-boot
Diffstat (limited to 'include/configs/gw8260.h')
-rw-r--r--include/configs/gw8260.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/configs/gw8260.h b/include/configs/gw8260.h
index 7c2c224060..d9187825e5 100644
--- a/include/configs/gw8260.h
+++ b/include/configs/gw8260.h
@@ -279,7 +279,8 @@
* To stop use: " "
*/
#define CONFIG_AUTOBOOT_KEYED
-#define CONFIG_AUTOBOOT_PROMPT "Autobooting in %d seconds, press \" \" to stop\n"
+#define CONFIG_AUTOBOOT_PROMPT \
+ "Autobooting in %d seconds, press \" \" to stop\n", bootdelay
#define CONFIG_AUTOBOOT_STOP_STR " "
#undef CONFIG_AUTOBOOT_DELAY_STR
#define DEBUG_BOOTKEYS 0
OpenPOWER on IntegriCloud