diff options
author | Wolfgang Denk <wd@denx.de> | 2008-07-16 16:38:59 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2008-07-31 17:08:27 +0200 |
commit | c37207d7f51e19c17f859966f314e27cc1231801 (patch) | |
tree | a872cd09a894e62514c928a82e6771b0e37d00ca /include/configs/PLU405.h | |
parent | 54754120637b6a7f4ff774fb199fc550bcfea1da (diff) |
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/PLU405.h')
-rw-r--r-- | include/configs/PLU405.h | 5 |
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 " " |