projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix merge problems
[platform/kernel/u-boot.git]
/
include
/
configs
/
ppmc8260.h
diff --git
a/include/configs/ppmc8260.h
b/include/configs/ppmc8260.h
index
56b4d92
..
dee6643
100644
(file)
--- a/
include/configs/ppmc8260.h
+++ b/
include/configs/ppmc8260.h
@@
-228,7
+228,8
@@
* To stop use: " "
*/
# define CONFIG_AUTOBOOT_KEYED
* 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
# define CONFIG_AUTOBOOT_STOP_STR " "
# undef CONFIG_AUTOBOOT_DELAY_STR
# define DEBUG_BOOTKEYS 0