diff options
Diffstat (limited to 'board/a3000/flash.c')
| -rw-r--r-- | board/a3000/flash.c | 22 | 
1 files changed, 11 insertions, 11 deletions
| diff --git a/board/a3000/flash.c b/board/a3000/flash.c index 13a5ca5b0..add2a2886 100644 --- a/board/a3000/flash.c +++ b/board/a3000/flash.c @@ -25,15 +25,15 @@  #include <common.h>  #include <mpc824x.h> -#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 @@ -108,12 +108,12 @@ unsigned long flash_init (void)  		      &flash_info[0]);  #endif -#ifdef	CFG_ENV_IS_IN_FLASH +#ifdef	CONFIG_ENV_IS_IN_FLASH  	/* ENV protection ON by default */ -	DEBUGF("protect environtment %x @ %x\n", CFG_ENV_ADDR, CFG_ENV_SECT_SIZE); +	DEBUGF("protect environtment %x @ %x\n", CONFIG_ENV_ADDR, CONFIG_ENV_SECT_SIZE);  	flash_protect(FLAG_PROTECT_SET, -		      CFG_ENV_ADDR, -		      CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1, +		      CONFIG_ENV_ADDR, +		      CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,  		      &flash_info[0]);  #endif |