diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-07-16 14:38:59 (GMT) |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-07-31 15:08:27 (GMT) |
| commit | c37207d7f51e19c17f859966f314e27cc1231801 (patch) | |
| tree | a872cd09a894e62514c928a82e6771b0e37d00ca /include/configs/CPCI405DT.h | |
| parent | 54754120637b6a7f4ff774fb199fc550bcfea1da (diff) | |
| download | u-boot-c37207d7f51e19c17f859966f314e27cc1231801.tar.xz | |
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/CPCI405DT.h')
| -rw-r--r-- | include/configs/CPCI405DT.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/configs/CPCI405DT.h b/include/configs/CPCI405DT.h index 6b585be..c173539 100644 --- a/include/configs/CPCI405DT.h +++ b/include/configs/CPCI405DT.h @@ -152,8 +152,9 @@ #define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */ /* Only interrupt boot if special string is typed */ -#define CONFIG_AUTOBOOT_KEYED 1 -#define CONFIG_AUTOBOOT_PROMPT "Autobooting in %d seconds\n" +#define CONFIG_AUTOBOOT_KEYED 1 +#define CONFIG_AUTOBOOT_PROMPT \ + "Autobooting in %d seconds\n", bootdelay #undef CONFIG_AUTOBOOT_DELAY_STR #undef CONFIG_AUTOBOOT_STOP_STR /* defined via environment var */ #define CONFIG_AUTOBOOT_STOP_STR2 "esdesd" /* esd special for esd access*/ |