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]
/
drivers
/
mtd
/
cfi_flash.c
diff --git
a/drivers/mtd/cfi_flash.c
b/drivers/mtd/cfi_flash.c
index
7937b61
..
0d1ee8a
100644
(file)
--- a/
drivers/mtd/cfi_flash.c
+++ b/
drivers/mtd/cfi_flash.c
@@
-255,7
+255,7
@@
u64 flash_read64(void *addr)__attribute__((weak, alias("__flash_read64")));
/*-----------------------------------------------------------------------
*/
/*-----------------------------------------------------------------------
*/
-#if defined(CONFIG_ENV_IS_IN_FLASH) || defined(C
F
G_ENV_ADDR_REDUND) || (CFG_MONITOR_BASE >= CFG_FLASH_BASE)
+#if defined(CONFIG_ENV_IS_IN_FLASH) || defined(C
ONFI
G_ENV_ADDR_REDUND) || (CFG_MONITOR_BASE >= CFG_FLASH_BASE)
static flash_info_t *flash_get_info(ulong base)
{
int i;
static flash_info_t *flash_get_info(ulong base)
{
int i;
@@
-2033,17
+2033,17
@@
unsigned long flash_init (void)
/* Environment protection ON by default */
#ifdef CONFIG_ENV_IS_IN_FLASH
flash_protect (FLAG_PROTECT_SET,
/* Environment protection ON by default */
#ifdef CONFIG_ENV_IS_IN_FLASH
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SECT_SIZE - 1,
- flash_get_info(C
F
G_ENV_ADDR));
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE - 1,
+ flash_get_info(C
ONFI
G_ENV_ADDR));
#endif
/* Redundant environment protection ON by default */
#endif
/* Redundant environment protection ON by default */
-#ifdef C
F
G_ENV_ADDR_REDUND
+#ifdef C
ONFI
G_ENV_ADDR_REDUND
flash_protect (FLAG_PROTECT_SET,
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + CF
G_ENV_SIZE_REDUND - 1,
- flash_get_info(C
F
G_ENV_ADDR_REDUND));
+ C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + CONFI
G_ENV_SIZE_REDUND - 1,
+ flash_get_info(C
ONFI
G_ENV_ADDR_REDUND));
#endif
#if defined(CFG_FLASH_AUTOPROTECT_LIST)
#endif
#if defined(CFG_FLASH_AUTOPROTECT_LIST)