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>

diff --git a/common/main.c b/common/main.c
index 79ad2912a751c6097e524dca9b7224990f30fb96..187ef8a3a5a6be1cdf600931fbf1c3c7f12d9ac0 100644 (file)
--- a/common/main.c
+++ b/common/main.c
@@ -116,7 +116,7 @@ static __inline__ int abortboot(int bootdelay)
        u_int i;
 
 #  ifdef CONFIG_AUTOBOOT_PROMPT
-       printf(CONFIG_AUTOBOOT_PROMPT, bootdelay);
+       printf(CONFIG_AUTOBOOT_PROMPT);
 #  endif
 
 #  ifdef CONFIG_AUTOBOOT_DELAY_STR
@@ -212,7 +212,7 @@ static __inline__ int abortboot(int bootdelay)
        int abort = 0;
 
 #ifdef CONFIG_MENUPROMPT
-       printf(CONFIG_MENUPROMPT, bootdelay);
+       printf(CONFIG_MENUPROMPT);
 #else
        printf("Hit any key to stop autoboot: %2d ", bootdelay);
 #endif

diff --git a/doc/README.autoboot b/doc/README.autoboot
index e4c41867351a2233bc623c753adc00eaf3919dd1..2042fe5c4063b95e791cbbd29744f85665782e10 100644 (file)
--- a/doc/README.autoboot
+++ b/doc/README.autoboot
@@ -114,10 +114,17 @@ What they do
        CONFIG_AUTOBOOT_PROMPT is displayed before the boot delay
        selected by CONFIG_BOOTDELAY starts. If it is not defined
        there is no output indicating that autoboot is in progress.
-       If "%d" is included, it is replaced by the number of seconds
-       remaining before autoboot will start, but it does not count
-       down the seconds. "autoboot in %d seconds\n" is a reasonable
-       prompt.
+
+       Note that CONFIG_AUTOBOOT_PROMPT is used as the (only)
+       argument to a printf() call, so it may contain '%' format
+       specifications, provided that it also includes, sepearated by
+       commas exactly like in a printf statement, the required
+       arguments. It is the responsibility of the user to select only
+       such arguments that are valid in the given context. A
+       reasonable prompt could be defined as
+
+               #define CONFIG_AUTOBOOT_PROMPT \
+                       "autoboot in %d seconds\n",bootdelay
 
        If CONFIG_AUTOBOOT_DELAY_STR or "bootdelaykey" is specified
        and this string is received from console input before

diff --git a/include/configs/APC405.h b/include/configs/APC405.h
index 02f0c76e0749274118b6ff788c745f83d5fed73c..2f266a242ffad0fece4ff5cb050d081ccc82d8ed 100644 (file)
--- a/include/configs/APC405.h
+++ b/include/configs/APC405.h
@@ -193,7 +193,8 @@
 /* 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_PROMPT \
+       "Press SPACE to abort autoboot in %d seconds\n", bootdelay
 #undef CONFIG_AUTOBOOT_DELAY_STR
 #define CONFIG_AUTOBOOT_STOP_STR " "
 

diff --git a/include/configs/AmigaOneG3SE.h b/include/configs/AmigaOneG3SE.h
index a992498dc084c144c1db39817c09bf95b555978a..84efd2fe086535f67b0ddfc55ca11fb795c54017 100644 (file)
--- a/include/configs/AmigaOneG3SE.h
+++ b/include/configs/AmigaOneG3SE.h
@@ -371,7 +371,8 @@
 #define CONFIG_BOOTDELAY       5 /* Boot automatically after five seconds */
 #define CONFIG_PREBOOT         ""
 #define CONFIG_BOOTCOMMAND     "fdcboot; diskboot"
-#define CONFIG_MENUPROMPT      "Press any key to interrupt autoboot: %2d "
+#define CONFIG_MENUPROMPT      \
+       "Press any key to interrupt autoboot: %2d ", bootdelay
 #define CONFIG_MENUKEY         ' '
 #define CONFIG_MENUCOMMAND     "menu"
 /* #define CONFIG_AUTOBOOT_KEYED */

diff --git a/include/configs/CPCI405DT.h b/include/configs/CPCI405DT.h
index 6b585bed5f719ef844ab1f75e0c68ee2708d2ba5..c173539202269c6919d4b26a3b5dcc506b45f818 100644 (file)
--- 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*/

diff --git a/include/configs/DU440.h b/include/configs/DU440.h
index 0f5f85c22a66cd1351132c4478c9ef08b428e511..64c9ac076da64b61c05611c4b14b0f685c49bdf8 100644 (file)
--- a/include/configs/DU440.h
+++ b/include/configs/DU440.h
@@ -345,8 +345,9 @@ int du440_phy_addr(int devnum);
 #define CONFIG_ZERO_BOOTDELAY_CHECK    /* check for keypress on bootdelay==0 */
 #define CONFIG_VERSION_VARIABLE 1      /* include version env variable */
 
-#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
 #define CONFIG_AUTOBOOT_DELAY_STR "d"
 #define CONFIG_AUTOBOOT_STOP_STR " "
 

diff --git a/include/configs/GTH.h b/include/configs/GTH.h
index 00e09f703cd681cc9c85b362fe50f7597777aa3e..461670a1042559dc984b37261861aa14f973ac2c 100644 (file)
--- a/include/configs/GTH.h
+++ b/include/configs/GTH.h
@@ -62,8 +62,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 second\n"
+#define CONFIG_AUTOBOOT_KEYED  1
+#define CONFIG_AUTOBOOT_PROMPT \
+       "Press space to abort autoboot in %d second\n", bootdelay
 #define CONFIG_AUTOBOOT_DELAY_STR "d"
 #define CONFIG_AUTOBOOT_STOP_STR " "
 

diff --git a/include/configs/KUP4K.h b/include/configs/KUP4K.h
index f6c31ea84972e2ca8c2cce256e79f073dcf062e1..e52fbfde0e74be74d3d97069e7992acd047ddc14 100644 (file)
--- a/include/configs/KUP4K.h
+++ b/include/configs/KUP4K.h
@@ -488,7 +488,8 @@
 
 #define CONFIG_AUTOBOOT_KEYED          /* use key strings to stop autoboot */
 #if 0
-#define CONFIG_AUTOBOOT_PROMPT         "Boote in %d Sekunden - stop mit \"2\"\n"
+#define CONFIG_AUTOBOOT_PROMPT         \
+       "Boote in %d Sekunden - stop mit \"2\"\n", bootdelay
 #endif
 #define CONFIG_AUTOBOOT_STOP_STR       "." /* easy to stop for now */
 #define CONFIG_SILENT_CONSOLE  1

diff --git a/include/configs/KUP4X.h b/include/configs/KUP4X.h
index e558aa481b3d6f1adb43e49c841358f1ea6afb16..be0c7af8f3e811c54969842991cae9ccccb2cfaf 100644 (file)
--- a/include/configs/KUP4X.h
+++ b/include/configs/KUP4X.h
@@ -454,7 +454,8 @@
 
 #define CONFIG_AUTOBOOT_KEYED          /* use key strings to stop autoboot     */
 #if 0
-#define CONFIG_AUTOBOOT_PROMPT         "Boote in %d Sekunden - stop mit \"2\"\n"
+#define CONFIG_AUTOBOOT_PROMPT         \
+       "Boote in %d Sekunden - stop mit \"2\"\n", bootdelay
 #endif
 #define CONFIG_AUTOBOOT_STOP_STR       "."     /* easy to stop for now         */
 #define CONFIG_SILENT_CONSOLE  1

diff --git a/include/configs/MVBLUE.h b/include/configs/MVBLUE.h
index d08d79520c97c2f00f542afa4737398d3ac6c9ae..8e247af63cd43cff672a493cae02366511d5e9cf 100644 (file)
--- a/include/configs/MVBLUE.h
+++ b/include/configs/MVBLUE.h
@@ -59,17 +59,18 @@
 
 #define CONFIG_CLOCKS_IN_MHZ   1
 
-#define CONFIG_BOARD_TYPES    1
+#define CONFIG_BOARD_TYPES     1
 
 #define CONFIG_CONS_INDEX      1
 #define CONFIG_BAUDRATE                115200
 #define CFG_BAUDRATE_TABLE     { 9600, 19200, 38400, 57600, 115200 }
 
-#define CONFIG_BOOTDELAY               3
+#define CONFIG_BOOTDELAY       3
 #define CONFIG_BOOT_RETRY_TIME -1
 
 #define CONFIG_AUTOBOOT_KEYED
-#define CONFIG_AUTOBOOT_PROMPT         "autoboot in %d seconds (stop with 's')...\n"
+#define CONFIG_AUTOBOOT_PROMPT         \
+       "autoboot in %d seconds (stop with 's')...\n", bootdelay
 #define CONFIG_AUTOBOOT_STOP_STR       "s"
 #define CONFIG_ZERO_BOOTDELAY_CHECK
 #define CONFIG_RESET_TO_RETRY          60

diff --git a/include/configs/NC650.h b/include/configs/NC650.h
index 0b094827d76a3dc0114e421f59e8128a2d5dd070..84c6e9b6179c7539c4405b7e98e876abea416a08 100644 (file)
--- a/include/configs/NC650.h
+++ b/include/configs/NC650.h
@@ -65,9 +65,10 @@
 #define CFG_MEASURE_CPUCLK
 #define CFG_8XX_XIN                    CONFIG_8xx_OSCLK
 
-#define CONFIG_BOOTDELAY       5       /* autoboot after 5 seconds     */
+#define CONFIG_BOOTDELAY               5       /* autoboot after 5 seconds     */
 #define CONFIG_AUTOBOOT_KEYED
-#define CONFIG_AUTOBOOT_PROMPT         "\nEnter password - autoboot in %d seconds...\n"
+#define CONFIG_AUTOBOOT_PROMPT         \
+       "\nEnter password - autoboot in %d seconds...\n", bootdelay
 #define CONFIG_AUTOBOOT_DELAY_STR      "ids"
 #define CONFIG_BOOT_RETRY_TIME         900
 #define CONFIG_BOOT_RETRY_MIN          30

diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h
index 0bd77c07b653711a4ddcb57f773644d56a27cdc2..a3d1c56dc25ea32f2f80b8df9646d0d930161ed4 100644 (file)
--- 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 " "
 

diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h
index e8b405a8849260350ce1243aed6d74d6a58b52d2..42f1d8d006283a30cb479b6f0d6648fc3a96f08c 100644 (file)
--- a/include/configs/PMC440.h
+++ b/include/configs/PMC440.h
@@ -409,7 +409,8 @@
 #define CONFIG_VERSION_VARIABLE 1      /* include version env variable */
 
 #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
 #undef CONFIG_AUTOBOOT_DELAY_STR
 #define CONFIG_AUTOBOOT_STOP_STR " "
 

diff --git a/include/configs/RPXlite_DW.h b/include/configs/RPXlite_DW.h
index 872765c92f40370b1724f9f17e412ec56050d8ea..faae407da5d7c0515f0393b68283c43a74382cf5 100644 (file)
--- a/include/configs/RPXlite_DW.h
+++ b/include/configs/RPXlite_DW.h
@@ -68,7 +68,8 @@
 #ifdef DEPLOYMENT
 #define CONFIG_BOOT_RETRY_TIME         -1
 #define CONFIG_AUTOBOOT_KEYED
-#define CONFIG_AUTOBOOT_PROMPT         "autoboot in %d seconds (stop with 'st')...\n"
+#define CONFIG_AUTOBOOT_PROMPT         \
+       "autoboot in %d seconds (stop with 'st')...\n", bootdelay
 #define CONFIG_AUTOBOOT_STOP_STR       "st"
 #define CONFIG_ZERO_BOOTDELAY_CHECK
 #define CONFIG_RESET_TO_RETRY          1

diff --git a/include/configs/SXNI855T.h b/include/configs/SXNI855T.h
index 3aee45c3c7c8cd0304557cd94fd961425ae90efd..aefc7eecbd121ff7e5bc9690668ad1eba8ee33b8 100644 (file)
--- a/include/configs/SXNI855T.h
+++ b/include/configs/SXNI855T.h
@@ -465,7 +465,7 @@
 
 #if 1
 #define CONFIG_AUTOBOOT_KEYED          /* use key strings to stop autoboot */
-#define CONFIG_AUTOBOOT_PROMPT         "autoboot in %d seconds\n"
+#define CONFIG_AUTOBOOT_PROMPT         "autoboot in %d seconds\n", bootdelay
 #define CONFIG_AUTOBOOT_DELAY_STR      "delayabit"
 #define CONFIG_AUTOBOOT_STOP_STR       " " /* easy to stop for now */
 #endif

diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h
index 84d235ea9d5eeecb2eccc352c7d9f6f6974f577f..f040b863c77fe97244f99e56869034b93da9d890 100644 (file)
--- a/include/configs/atngw100.h
+++ b/include/configs/atngw100.h
@@ -82,8 +82,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       " "
 

diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h
index 90910bb98a5e50ea5704d668d6e69a670ec5c245..68f0cecf39e8dc195f6eba6ccd9e8f8ead4702a9 100644 (file)
--- a/include/configs/atstk1002.h
+++ b/include/configs/atstk1002.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       " "
 

diff --git a/include/configs/atstk1003.h b/include/configs/atstk1003.h
index 03472a8869ca63ec811ba49c076361e59d9a2e81..d3a2f69edeacb3d841a6d0cacd27c59b4a6e1edd 100644 (file)
--- 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       " "
 

diff --git a/include/configs/atstk1004.h b/include/configs/atstk1004.h
index 07add821a94e55b6665224479fb9c00aa2568063..a37ba92416bb2f9876b85851253855ebc8c50dc2 100644 (file)
--- a/include/configs/atstk1004.h
+++ b/include/configs/atstk1004.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       " "
 

diff --git a/include/configs/atstk1006.h b/include/configs/atstk1006.h
index f9af67540a093243473a369e520d836262683e2a..a6c5b6e24eda239fd659090e5107c9fa5f307320 100644 (file)
--- a/include/configs/atstk1006.h
+++ b/include/configs/atstk1006.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       " "
 

diff --git a/include/configs/gth2.h b/include/configs/gth2.h
index c2d6ca70a5432557381d85943a2edda4fabb3140..7f7190bcdb4d51f13d2a8b69fcbe905289fa698e 100644 (file)
--- a/include/configs/gth2.h
+++ b/include/configs/gth2.h
@@ -54,8 +54,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 second\n"
+#define CONFIG_AUTOBOOT_KEYED  1
+#define CONFIG_AUTOBOOT_PROMPT \
+       "Press space to abort autoboot in %d second\n", bootdelay
 #define CONFIG_AUTOBOOT_DELAY_STR "d"
 #define CONFIG_AUTOBOOT_STOP_STR " "
 

diff --git a/include/configs/gw8260.h b/include/configs/gw8260.h
index 7c2c224060d8247280452f8a223c14add8226d17..d9187825e54052d69efa73ce9eca8697d0d72616 100644 (file)
--- a/include/configs/gw8260.h
+++ b/include/configs/gw8260.h
@@ -279,7 +279,8 @@
  *     To stop  use: " "
  */
 #define CONFIG_AUTOBOOT_KEYED
-#define CONFIG_AUTOBOOT_PROMPT  "Autobooting in %d seconds, press \" \" to stop\n"
+#define CONFIG_AUTOBOOT_PROMPT \
+       "Autobooting in %d seconds, press \" \" to stop\n", bootdelay
 #define CONFIG_AUTOBOOT_STOP_STR    " "
 #undef  CONFIG_AUTOBOOT_DELAY_STR
 #define DEBUG_BOOTKEYS      0

diff --git a/include/configs/hymod.h b/include/configs/hymod.h
index 01e79701623a0b28990b60353f3b26b474043ef8..264192f2620b3b7999c3ab9b19e8fe5dffee4504 100644 (file)
--- a/include/configs/hymod.h
+++ b/include/configs/hymod.h
@@ -224,7 +224,7 @@
  */
 #define CONFIG_AUTOBOOT_KEYED
 #define CONFIG_AUTOBOOT_PROMPT         "Autobooting in %d seconds, " \
-                                       "press <SPACE> to stop\n"
+                                       "press <SPACE> to stop\n", bootdelay
 #define CONFIG_AUTOBOOT_STOP_STR       " "
 #undef CONFIG_AUTOBOOT_DELAY_STR
 #define DEBUG_BOOTKEYS         0

diff --git a/include/configs/linkstation.h b/include/configs/linkstation.h
index d3908b9eaf460c7142442c35080903ad84dbe9f3..bc642941162c01f7fd3987ee202165bc58e5679b 100644 (file)
--- 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

diff --git a/include/configs/lwmon.h b/include/configs/lwmon.h
index 8a8270260a36ba2ad80891fd8ce1087bf404ee13..87abfba14c2be96ee71cc4555c8aeef9f6afbb95 100644 (file)
--- a/include/configs/lwmon.h
+++ b/include/configs/lwmon.h
@@ -252,7 +252,8 @@
 #define        CONFIG_POST_KEY_MAGIC   "3C+3E" /* press F3 + F5 keys to force POST */
 #if 0
 #define        CONFIG_AUTOBOOT_KEYED           /* Enable "password" protection */
-#define CONFIG_AUTOBOOT_PROMPT "\nEnter password - autoboot in %d sec...\n"
+#define CONFIG_AUTOBOOT_PROMPT \
+       "\nEnter password - autoboot in %d sec...\n", bootdelay
 #define CONFIG_AUTOBOOT_DELAY_STR      "  "    /* "password"   */
 #endif
 /*----------------------------------------------------------------------*/

diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h
index cf406c8c0da6f5ea9c5bae5f696811c1418d680c..2f3a066062871bc3565b502017a3bc12eea533c9 100644 (file)
--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@@ -277,7 +277,8 @@
 #define        CONFIG_POST_KEY_MAGIC   "3C+3E" /* press F3 + F5 keys to force POST */
 #if 0
 #define        CONFIG_AUTOBOOT_KEYED           /* Enable "password" protection */
-#define CONFIG_AUTOBOOT_PROMPT "\nEnter password - autoboot in %d sec...\n"
+#define CONFIG_AUTOBOOT_PROMPT \
+       "\nEnter password - autoboot in %d sec...\n", bootdelay
 #define CONFIG_AUTOBOOT_DELAY_STR      "  "    /* "password"   */
 #endif
 

diff --git a/include/configs/m501sk.h b/include/configs/m501sk.h
index 060330ef899a5ce4701458cc1ff300c4b8f07dae..e4be1ed33fe491e7f04a80263a85b0bc83c87559 100644 (file)
--- a/include/configs/m501sk.h
+++ b/include/configs/m501sk.h
@@ -40,7 +40,6 @@
 #define CONFIG_SETUP_MEMORY_TAGS       1
 #define CONFIG_INITRD_TAG              1
 
-#undef CONFIG_AUTOBOOT_PROMPT
 #define CONFIG_MENUPROMPT              "."
 
 /*

diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h
index b6843af3dc6c9f93131e91ce3cc4116045614942..3d1eafee6966d8626a3a3a6d3125894f2eb6e746 100644 (file)
--- a/include/configs/motionpro.h
+++ b/include/configs/motionpro.h
@@ -96,7 +96,7 @@
 #undef CONFIG_AUTOBOOT_DELAY_STR
 #undef CONFIG_BOOTARGS
 #define CONFIG_AUTOBOOT_PROMPT "Autobooting in %d seconds, "           \
-                                       "press \"<Esc><Esc>\" to stop\n"
+                               "press \"<Esc><Esc>\" to stop\n", bootdelay
 
 #define CONFIG_ETHADDR         00:50:C2:40:10:00
 #define CONFIG_OVERWRITE_ETHADDR_ONCE  1

diff --git a/include/configs/mp2usb.h b/include/configs/mp2usb.h
index 2eb4af1554d37278e36cf27c49d256ce562ef9d8..87264fbb4b5726393dc8d5785616d6c32bd88995 100644 (file)
--- a/include/configs/mp2usb.h
+++ b/include/configs/mp2usb.h
@@ -230,7 +230,8 @@
 #undef CONFIG_SILENT_CONSOLE           /* enable silent startup        */
 
 #define CONFIG_AUTOBOOT_KEYED
-#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_STOP_STR " "
 #define CONFIG_AUTOBOOT_DELAY_STR "d"
 

diff --git a/include/configs/netstar.h b/include/configs/netstar.h
index d4deda407fbe92f8cb3370c02744e33480da8b0a..756b7c2671759271bd40f098c1365b22b3287da3 100644 (file)
--- a/include/configs/netstar.h
+++ b/include/configs/netstar.h
@@ -195,7 +195,8 @@
 
 #if 0  /* feel free to disable for development */
 #define        CONFIG_AUTOBOOT_KEYED           /* Enable password protection   */
-#define CONFIG_AUTOBOOT_PROMPT         "\nNetStar PBX - boot in %d secs...\n"
+#define CONFIG_AUTOBOOT_PROMPT         \
+       "\nNetStar PBX - boot in %d secs...\n", bootdelay
 #define CONFIG_AUTOBOOT_DELAY_STR      "."     /* 1st "password"       */
 #endif
 

diff --git a/include/configs/ppmc8260.h b/include/configs/ppmc8260.h
index 56b4d92f1a70d6af5c89017303f270a9eb49872c..dee664361f92b046266c0f100d242a3d8be411e3 100644 (file)
--- a/include/configs/ppmc8260.h
+++ b/include/configs/ppmc8260.h
@@ -228,7 +228,8 @@
  *     To stop use: " "
  */
 # define CONFIG_AUTOBOOT_KEYED
-# define CONFIG_AUTOBOOT_PROMPT "Autobooting in %d seconds, press \" \" to stop\n"
+# define CONFIG_AUTOBOOT_PROMPT \
+       "Autobooting in %d seconds, press \" \" to stop\n", bootdelay
 # define CONFIG_AUTOBOOT_STOP_STR      " "
 # undef CONFIG_AUTOBOOT_DELAY_STR
 # define DEBUG_BOOTKEYS                0

diff --git a/include/configs/quantum.h b/include/configs/quantum.h
index f49e2b0716e146f5ebe9b975fc85825160167ccb..cc261c33e100de6935665f56d33f062ca9f8ae87 100644 (file)
--- a/include/configs/quantum.h
+++ b/include/configs/quantum.h
@@ -116,7 +116,8 @@
 
 
 #define CONFIG_AUTOBOOT_KEYED  /* Enable password protection */
-#define CONFIG_AUTOBOOT_PROMPT         "\nEnter password - autoboot in %d sec...\n"
+#define CONFIG_AUTOBOOT_PROMPT         \
+       "\nEnter password - autoboot in %d sec...\n", bootdelay
 #define CONFIG_AUTOBOOT_DELAY_STR      "system"
 /*
  * Miscellaneous configurable options

diff --git a/include/configs/rmu.h b/include/configs/rmu.h
index 28fb7c3318cf86110c6fa7d3560eb3c800e8eb33..596bf15566056717a00569e0f150e00f4d715c75 100644 (file)
--- a/include/configs/rmu.h
+++ b/include/configs/rmu.h
@@ -111,7 +111,8 @@
 
 
 #define        CONFIG_AUTOBOOT_KEYED           /* Enable password protection */
-#define        CONFIG_AUTOBOOT_PROMPT          "\nEnter password - autoboot in %d sec...\n"
+#define        CONFIG_AUTOBOOT_PROMPT          \
+       "\nEnter password - autoboot in %d sec...\n", bootdelay
 #define        CONFIG_AUTOBOOT_DELAY_STR       "system"
 
 /*

diff --git a/include/configs/sacsng.h b/include/configs/sacsng.h
index 2a398e8c45c67fb8bb95b413899ca441700222d8..8427752d78e661ecf5799ac9e79669cea9eda063 100644 (file)
--- a/include/configs/sacsng.h
+++ b/include/configs/sacsng.h
@@ -436,7 +436,7 @@
  *     To stop use: " "
  */
 #define CONFIG_AUTOBOOT_KEYED
-#define CONFIG_AUTOBOOT_PROMPT "Autobooting...\n"
+#define CONFIG_AUTOBOOT_PROMPT "Autobooting...\n"
 #define CONFIG_AUTOBOOT_STOP_STR       " "
 #undef  CONFIG_AUTOBOOT_DELAY_STR
 #define CONFIG_ZERO_BOOTDELAY_CHECK

diff --git a/include/configs/sbc8260.h b/include/configs/sbc8260.h
index 79931372113f79b5d3d9f4fea0b2a1fb4d122813..b92344ccc18c92bca0264fae472a23499c384728 100644 (file)
--- a/include/configs/sbc8260.h
+++ b/include/configs/sbc8260.h
@@ -306,7 +306,8 @@
  */
 #undef CONFIG_AUTOBOOT_KEYED
 #ifdef CONFIG_AUTOBOOT_KEYED
-#   define CONFIG_AUTOBOOT_PROMPT      "Autobooting in %d seconds, press \" \" to stop\n"
+#   define CONFIG_AUTOBOOT_PROMPT      \
+       "Autobooting in %d seconds, press \" \" to stop\n", bootdelay
 #   define CONFIG_AUTOBOOT_STOP_STR    " "
 #   undef  CONFIG_AUTOBOOT_DELAY_STR
 #   define DEBUG_BOOTKEYS              0

diff --git a/include/configs/sc3.h b/include/configs/sc3.h
index f6e40def518688d4da8c4f00320ecc66041f3260..87311ea6c7af0200894ed4edbc70f668c52fd122 100644 (file)
--- a/include/configs/sc3.h
+++ b/include/configs/sc3.h
@@ -132,7 +132,8 @@
 
 #if 1  /* feel free to disable for development */
 #define CONFIG_AUTOBOOT_KEYED          /* Enable password protection   */
-#define CONFIG_AUTOBOOT_PROMPT         "\nSC3 - booting... stop with ENTER\n"
+#define CONFIG_AUTOBOOT_PROMPT         \
+       "\nSC3 - booting... stop with ENTER\n"
 #define CONFIG_AUTOBOOT_DELAY_STR      "\r"    /* 1st "password"       */
 #define CONFIG_AUTOBOOT_DELAY_STR2     "\n"    /* 1st "password"       */
 #endif

diff --git a/include/configs/trab.h b/include/configs/trab.h
index de36fca11e745701043d3612b058c41268ec0042..b0615a0e37753b5d2481bfa82e1e414755630722 100644 (file)
--- a/include/configs/trab.h
+++ b/include/configs/trab.h
@@ -289,7 +289,8 @@
 
 #if 1  /* feel free to disable for development */
 #define        CONFIG_AUTOBOOT_KEYED           /* Enable password protection   */
-#define CONFIG_AUTOBOOT_PROMPT "\nEnter password - autoboot in %d sec...\n"
+#define CONFIG_AUTOBOOT_PROMPT         \
+       "\nEnter password - autoboot in %d sec...\n", bootdelay
 #define CONFIG_AUTOBOOT_DELAY_STR      "R"     /* 1st "password"       */
 #endif
 

diff --git a/include/configs/utx8245.h b/include/configs/utx8245.h
index 287a6187a2d9bd82cf98356c3298cb4b63fc34a4..1675ab752cbb145de7139cc88187a180acd0ccd5 100644 (file)
--- a/include/configs/utx8245.h
+++ b/include/configs/utx8245.h
@@ -58,7 +58,7 @@
 #define CFG_BAUDRATE_TABLE     { 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_BOOTDELAY       2
-#define CONFIG_AUTOBOOT_PROMPT "autoboot in %d seconds\n"
+#define CONFIG_AUTOBOOT_PROMPT "autoboot in %d seconds\n", bootdelay
 #define CONFIG_BOOTCOMMAND     "run nfsboot"   /* autoboot command     */
 #define CONFIG_BOOTARGS                "root=/dev/ram console=ttyS0,57600" /* RAMdisk */
 #define CONFIG_ETHADDR         00:AA:00:14:00:05       /* UTX5 */