diff options
Diffstat (limited to 'board/r360mpi/flash.c')
| -rw-r--r-- | board/r360mpi/flash.c | 20 | 
1 files changed, 10 insertions, 10 deletions
| diff --git a/board/r360mpi/flash.c b/board/r360mpi/flash.c index 9b42960c7..8145437b1 100644 --- a/board/r360mpi/flash.c +++ b/board/r360mpi/flash.c @@ -31,15 +31,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 @@ -111,11 +111,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_SIZE - 1, +			CONFIG_ENV_ADDR, +			CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,  			&flash_info[0]);  #endif |