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
drivers/mtd: Move conditional compilation to Makefile
[platform/kernel/u-boot.git]
/
include
/
configs
/
lwmon5.h
diff --git
a/include/configs/lwmon5.h
b/include/configs/lwmon5.h
index
cf406c8
..
3d135c4
100644
(file)
--- a/
include/configs/lwmon5.h
+++ b/
include/configs/lwmon5.h
@@
-124,7
+124,7
@@
* FLASH related
*----------------------------------------------------------------------*/
#define CFG_FLASH_CFI /* The flash is CFI compatible */
* FLASH related
*----------------------------------------------------------------------*/
#define CFG_FLASH_CFI /* The flash is CFI compatible */
-#define C
FG_FLASH_CFI_DRIVER
/* Use common CFI driver */
+#define C
ONFIG_FLASH_CFI_DRIVER
/* Use common CFI driver */
#define CFG_FLASH0 0xFC000000
#define CFG_FLASH1 0xF8000000
#define CFG_FLASH0 0xFC000000
#define CFG_FLASH1 0xF8000000
@@
-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_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
#define CONFIG_AUTOBOOT_DELAY_STR " " /* "password" */
#endif