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
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
[platform/kernel/u-boot.git]
/
include
/
configs
/
quantum.h
diff --git
a/include/configs/quantum.h
b/include/configs/quantum.h
index
f49e2b0
..
34a1ea6
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_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
#define CONFIG_AUTOBOOT_DELAY_STR "system"
/*
* Miscellaneous configurable options
@@
-169,13
+170,13
@@
#define CFG_FLASH_BASE 0xFF000000
#if 1
#define CFG_FLASH_BASE 0xFF000000
#if 1
- #define C
F
G_FLASH_CFI_DRIVER
+ #define C
ONFI
G_FLASH_CFI_DRIVER
#else
#else
- #undef C
F
G_FLASH_CFI_DRIVER
+ #undef C
ONFI
G_FLASH_CFI_DRIVER
#endif
#endif
-#ifdef C
F
G_FLASH_CFI_DRIVER
+#ifdef C
ONFI
G_FLASH_CFI_DRIVER
#define CFG_FLASH_CFI 1
#undef CFG_FLASH_USE_BUFFER_WRITE
#define CFG_FLASH_BANKS_LIST {CFG_FLASH_BASE}
#define CFG_FLASH_CFI 1
#undef CFG_FLASH_USE_BUFFER_WRITE
#define CFG_FLASH_BANKS_LIST {CFG_FLASH_BASE}