diff options
Diffstat (limited to 'board/lantec/flash.c')
| -rw-r--r-- | board/lantec/flash.c | 26 | 
1 files changed, 13 insertions, 13 deletions
| diff --git a/board/lantec/flash.c b/board/lantec/flash.c index 0faa82cba..e08da33b3 100644 --- a/board/lantec/flash.c +++ b/board/lantec/flash.c @@ -29,15 +29,15 @@  #include <common.h>  #include <mpc8xx.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 @@ -138,11 +138,11 @@ 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 */  	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 @@ -170,11 +170,11 @@ unsigned long flash_init (void)  			      &flash_info[1]);  #endif -#ifdef	CFG_ENV_IS_IN_FLASH +#ifdef	CONFIG_ENV_IS_IN_FLASH  		/* ENV protection ON by default */  		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[1]);  #endif  	} else { |