summaryrefslogtreecommitdiffstats
path: root/include/configs/linkstation.h
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-07-16 16:38:59 +0200
committerWolfgang Denk <wd@denx.de>2008-07-31 17:08:27 +0200
commitc37207d7f51e19c17f859966f314e27cc1231801 (patch)
treea872cd09a894e62514c928a82e6771b0e37d00ca /include/configs/linkstation.h
parent54754120637b6a7f4ff774fb199fc550bcfea1da (diff)
downloadblackbird-obmc-uboot-c37207d7f51e19c17f859966f314e27cc1231801.tar.gz
blackbird-obmc-uboot-c37207d7f51e19c17f859966f314e27cc1231801.zip
Fix printf() format problems with configurable prompts
U-Boot allows for configurable prompt strings using the CONFIG_AUTOBOOT_PROMPT resp. CONFIG_MENUPROMPT definitions. So far, the assumption was that any such user defined problts would contain exactly one "%d" format specifier. But some boards did not. To allow for flexible boot prompts without adding too complex code we now allow to specify the whole list of printf() arguments in the user definition. This is powerful, but requires a responsible user who really understands what he is doing, as he needs to know for exanple which variables are available in the respective context. Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include/configs/linkstation.h')
-rw-r--r--include/configs/linkstation.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/configs/linkstation.h b/include/configs/linkstation.h
index d3908b9eaf..bc64294116 100644
--- a/include/configs/linkstation.h
+++ b/include/configs/linkstation.h
@@ -82,7 +82,8 @@
#undef CONFIG_BOOT_RETRY_TIME
#define CONFIG_AUTOBOOT_KEYED
-#define CONFIG_AUTOBOOT_PROMPT "Boot in %02d seconds ('s' to stop)..."
+#define CONFIG_AUTOBOOT_PROMPT \
+ "Boot in %02d seconds ('s' to stop)...", bootdelay
#define CONFIG_AUTOBOOT_STOP_STR "s"
#define CONFIG_CMD_IDE
OpenPOWER on IntegriCloud