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 macros to CONFIG_ENV
[platform/kernel/u-boot.git]
/
board
/
nc650
/
flash.c
diff --git
a/board/nc650/flash.c
b/board/nc650/flash.c
index
a7fc084
..
d23e976
100644
(file)
--- a/
board/nc650/flash.c
+++ b/
board/nc650/flash.c
@@
-42,14
+42,14
@@
DECLARE_GLOBAL_DATA_PTR;
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH)
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH)
-# ifndef C
F
G_ENV_ADDR
-# define C
FG_ENV_ADDR (CFG_FLASH_BASE + CF
G_ENV_OFFSET)
+# ifndef C
ONFI
G_ENV_ADDR
+# define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET)
# endif
# endif
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
# endif
-# ifndef C
F
G_ENV_SECT_SIZE
-# define C
FG_ENV_SECT_SIZE CF
G_ENV_SIZE
+# ifndef C
ONFI
G_ENV_SECT_SIZE
+# define C
ONFIG_ENV_SECT_SIZE CONFI
G_ENV_SIZE
# endif
#endif
# endif
#endif
@@
-174,8
+174,8
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect (FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif