summaryrefslogtreecommitdiffstats
path: root/include/configs/PLU405.h
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2008-08-06 14:05:38 +0200
committerStefan Roese <sr@denx.de>2008-08-06 14:05:38 +0200
commitf2302d4430e7f3f48308d6a585320fe96af8afbd (patch)
treeeec529fa883a32b0bd44f65aa46a454dc5c69688 /include/configs/PLU405.h
parent9246f5ecfd353ae297a02ffd5328402acf16c9dd (diff)
downloadblackbird-obmc-uboot-f2302d4430e7f3f48308d6a585320fe96af8afbd.tar.gz
blackbird-obmc-uboot-f2302d4430e7f3f48308d6a585320fe96af8afbd.zip
Fix merge problems
Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'include/configs/PLU405.h')
-rw-r--r--include/configs/PLU405.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h
index 0bd77c07b6..a3d1c56dc2 100644
--- a/include/configs/PLU405.h
+++ b/include/configs/PLU405.h
@@ -154,8 +154,9 @@
/* Only interrupt boot if space is pressed */
/* If a long serial cable is connected but */
/* other end is dead, garbage will be read */
-#define CONFIG_AUTOBOOT_KEYED 1
-#define CONFIG_AUTOBOOT_PROMPT "Press SPACE to abort autoboot in %d seconds\n"
+#define CONFIG_AUTOBOOT_KEYED 1
+#define CONFIG_AUTOBOOT_PROMPT \
+ "Press SPACE to abort autoboot in %d seconds\n", bootdelay
#undef CONFIG_AUTOBOOT_DELAY_STR
#define CONFIG_AUTOBOOT_STOP_STR " "
OpenPOWER on IntegriCloud