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
/
sacsng
/
flash.c
diff --git
a/board/sacsng/flash.c
b/board/sacsng/flash.c
index
4fd04df
..
8fecf95
100644
(file)
--- a/
board/sacsng/flash.c
+++ b/
board/sacsng/flash.c
@@
-27,11
+27,11
@@
#undef DEBUG
#undef DEBUG
-#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
@@
-69,15
+69,15
@@
unsigned long flash_init (void)
/* monitor protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_MONITOR_BASE,
/* monitor protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_MONITOR_BASE,
- CFG_MONITOR_BASE+
CFG_MONITOR_LEN
-1,
+ CFG_MONITOR_BASE+
monitor_flash_len
-1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
-#ifdef C
F
G_ENV_IS_IN_FLASH
+#ifdef C
ONFI
G_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
/* 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
@@
-86,15
+86,15
@@
unsigned long flash_init (void)
/* monitor protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_MONITOR_BASE,
/* monitor protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_MONITOR_BASE,
- CFG_MONITOR_BASE+
CFG_MONITOR_LEN
-1,
+ CFG_MONITOR_BASE+
monitor_flash_len
-1,
&flash_info[1]);
#endif
&flash_info[1]);
#endif
-#ifdef C
F
G_ENV_IS_IN_FLASH
+#ifdef C
ONFI
G_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
/* 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[1]);
#endif
} else {
&flash_info[1]);
#endif
} else {