diff options
Diffstat (limited to 'board/fads/flash.c')
| -rw-r--r-- | board/fads/flash.c | 22 | 
1 files changed, 11 insertions, 11 deletions
| diff --git a/board/fads/flash.c b/board/fads/flash.c index 7cda3a412..cd0e4d5dc 100644 --- a/board/fads/flash.c +++ b/board/fads/flash.c @@ -26,15 +26,15 @@  flash_info_t flash_info[CFG_MAX_FLASH_BANKS];	/* info for FLASH chips */ -#if defined(CFG_ENV_IS_IN_FLASH) -# ifndef  CFG_ENV_ADDR -#  define CFG_ENV_ADDR	(CFG_FLASH_BASE + CFG_ENV_OFFSET) +#if defined(CONFIG_ENV_IS_IN_FLASH) +# ifndef  CONFIG_ENV_ADDR +#  define CONFIG_ENV_ADDR	(CFG_FLASH_BASE + CONFIG_ENV_OFFSET)  # endif -# ifndef  CFG_ENV_SIZE -#  define CFG_ENV_SIZE	CFG_ENV_SECT_SIZE +# ifndef  CONFIG_ENV_SIZE +#  define CONFIG_ENV_SIZE	CONFIG_ENV_SECT_SIZE  # endif -# ifndef  CFG_ENV_SECT_SIZE -#  define CFG_ENV_SECT_SIZE  CFG_ENV_SIZE +# ifndef  CONFIG_ENV_SECT_SIZE +#  define CONFIG_ENV_SECT_SIZE  CONFIG_ENV_SIZE  # endif  #endif @@ -124,12 +124,12 @@ unsigned long flash_init (void)  				       &flash_info[i]);  #endif -#ifdef	CFG_ENV_IS_IN_FLASH +#ifdef	CONFIG_ENV_IS_IN_FLASH  		/* ENV protection ON by default */ -		if (CFG_ENV_ADDR >= flash_info[i].start[0]) +		if (CONFIG_ENV_ADDR >= flash_info[i].start[0])  			flash_protect (FLAG_PROTECT_SET, -				       CFG_ENV_ADDR, -				       CFG_ENV_ADDR + CFG_ENV_SIZE - 1, +				       CONFIG_ENV_ADDR, +				       CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,  				       &flash_info[i]);  #endif  	} |