diff options
Diffstat (limited to 'board/amcc/walnut/flash.c')
| -rw-r--r-- | board/amcc/walnut/flash.c | 18 | 
1 files changed, 9 insertions, 9 deletions
| diff --git a/board/amcc/walnut/flash.c b/board/amcc/walnut/flash.c index 056f9b936..d363564d5 100644 --- a/board/amcc/walnut/flash.c +++ b/board/amcc/walnut/flash.c @@ -58,7 +58,7 @@ unsigned long flash_init(void)  	unsigned long base_b0, base_b1;  	/* Init: no FLASHes known */ -	for (i = 0; i < CFG_MAX_FLASH_BANKS; ++i) { +	for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; ++i) {  		flash_info[i].flash_id = FLASH_UNKNOWN;  	} @@ -73,21 +73,21 @@ unsigned long flash_init(void)  	}  	/* Only one bank */ -	if (CFG_MAX_FLASH_BANKS == 1) { +	if (CONFIG_SYS_MAX_FLASH_BANKS == 1) {  		/* Setup offsets */  		flash_get_offsets(FLASH_BASE0_PRELIM, &flash_info[0]);  		/* Monitor protection ON by default */  		(void)flash_protect(FLAG_PROTECT_SET, -				    CFG_MONITOR_BASE, -				    CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, +				    CONFIG_SYS_MONITOR_BASE, +				    CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN - 1,  				    &flash_info[0]); -#ifdef CFG_ENV_IS_IN_FLASH -		(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, -				    CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, +#ifdef CONFIG_ENV_IS_IN_FLASH +		(void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR, +				    CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,  				    &flash_info[0]); -		(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND, -				    CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1, +		(void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND, +				    CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1,  				    &flash_info[0]);  #endif |