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
rename CFG_ENV_IS_IN_FLASH in CONFIG_ENV_IS_IN_FLASH
[platform/kernel/u-boot.git]
/
board
/
bmw
/
flash.c
diff --git
a/board/bmw/flash.c
b/board/bmw/flash.c
index
6d3cfab
..
4c7971a
100644
(file)
--- a/
board/bmw/flash.c
+++ b/
board/bmw/flash.c
@@
-31,7
+31,7
@@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
-#if defined(C
F
G_ENV_IS_IN_FLASH)
+#if defined(C
ONFI
G_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
# endif
# ifndef CFG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
# endif
@@
-224,7
+224,7
@@
unsigned long flash_init (void)
&flash_info[0]);
#endif
&flash_info[0]);
#endif
-#if defined(C
F
G_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
+#if defined(C
ONFI
G_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1,