diff options
Diffstat (limited to 'drivers/mtd/cfi_flash.c')
| -rw-r--r-- | drivers/mtd/cfi_flash.c | 18 | 
1 files changed, 9 insertions, 9 deletions
| diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index a74321d5c..0d1ee8a45 100644 --- 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(CFG_ENV_IS_IN_FLASH) || defined(CFG_ENV_ADDR_REDUND) || (CFG_MONITOR_BASE >= CFG_FLASH_BASE) +#if defined(CONFIG_ENV_IS_IN_FLASH) || defined(CONFIG_ENV_ADDR_REDUND) || (CFG_MONITOR_BASE >= CFG_FLASH_BASE)  static flash_info_t *flash_get_info(ulong base)  {  	int i; @@ -2031,19 +2031,19 @@ unsigned long flash_init (void)  #endif  	/* Environment protection ON by default */ -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH  	flash_protect (FLAG_PROTECT_SET, -		       CFG_ENV_ADDR, -		       CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, -		       flash_get_info(CFG_ENV_ADDR)); +		       CONFIG_ENV_ADDR, +		       CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1, +		       flash_get_info(CONFIG_ENV_ADDR));  #endif  	/* Redundant environment protection ON by default */ -#ifdef CFG_ENV_ADDR_REDUND +#ifdef CONFIG_ENV_ADDR_REDUND  	flash_protect (FLAG_PROTECT_SET, -		       CFG_ENV_ADDR_REDUND, -		       CFG_ENV_ADDR_REDUND + CFG_ENV_SIZE_REDUND - 1, -		       flash_get_info(CFG_ENV_ADDR_REDUND)); +		       CONFIG_ENV_ADDR_REDUND, +		       CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1, +		       flash_get_info(CONFIG_ENV_ADDR_REDUND));  #endif  #if defined(CFG_FLASH_AUTOPROTECT_LIST) |