summaryrefslogtreecommitdiff
path: root/include/configs/atstk1003.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/atstk1003.h
parent9246f5ecfd353ae297a02ffd5328402acf16c9dd (diff)
downloadu-boot-imx-f2302d4430e7f3f48308d6a585320fe96af8afbd.zip
u-boot-imx-f2302d4430e7f3f48308d6a585320fe96af8afbd.tar.gz
u-boot-imx-f2302d4430e7f3f48308d6a585320fe96af8afbd.tar.bz2
Fix merge problems
Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'include/configs/atstk1003.h')
-rw-r--r--include/configs/atstk1003.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/configs/atstk1003.h b/include/configs/atstk1003.h
index 03472a8..d3a2f69 100644
--- a/include/configs/atstk1003.h
+++ b/include/configs/atstk1003.h
@@ -110,8 +110,8 @@
#define CONFIG_BOOTDELAY 1
#define CONFIG_AUTOBOOT 1
#define CONFIG_AUTOBOOT_KEYED 1
-#define CONFIG_AUTOBOOT_PROMPT \
- "Press SPACE to abort autoboot in %d seconds\n"
+#define CONFIG_AUTOBOOT_PROMPT \
+ "Press SPACE to abort autoboot in %d seconds\n", bootdelay
#define CONFIG_AUTOBOOT_DELAY_STR "d"
#define CONFIG_AUTOBOOT_STOP_STR " "