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
/
netstar.h
diff --git
a/include/configs/netstar.h
b/include/configs/netstar.h
index
d4deda4
..
756b7c2
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 */
#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
#define CONFIG_AUTOBOOT_DELAY_STR "." /* 1st "password" */
#endif