diff options
Diffstat (limited to 'board/cpc45/flash.c')
| -rw-r--r-- | board/cpc45/flash.c | 24 | 
1 files changed, 12 insertions, 12 deletions
| diff --git a/board/cpc45/flash.c b/board/cpc45/flash.c index db9a637b5..3826a54a3 100644 --- a/board/cpc45/flash.c +++ b/board/cpc45/flash.c @@ -26,14 +26,14 @@  #include <asm/processor.h>  #if defined(CONFIG_ENV_IS_IN_FLASH) -# ifndef  CFG_ENV_ADDR -#  define CFG_ENV_ADDR	(CFG_FLASH_BASE + CFG_ENV_OFFSET) +# 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 @@ -174,15 +174,15 @@ unsigned long flash_init (void)  		       &flash_info[0]);  #endif -#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) -#if CFG_ENV_ADDR >= CFG_FLASH_BASE + FLASH_BANK_SIZE +#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR) +#if CONFIG_ENV_ADDR >= CFG_FLASH_BASE + FLASH_BANK_SIZE  	flash_protect (FLAG_PROTECT_SET, -		       CFG_ENV_ADDR, -		       CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[1]); +		       CONFIG_ENV_ADDR, +		       CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[1]);  #else  	flash_protect (FLAG_PROTECT_SET, -		       CFG_ENV_ADDR, -		       CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]); +		       CONFIG_ENV_ADDR, +		       CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);  #endif  #endif |