diff options
Diffstat (limited to 'board/amcc')
| -rw-r--r-- | board/amcc/bamboo/flash.c | 10 | ||||
| -rw-r--r-- | board/amcc/bubinga/flash.c | 8 | ||||
| -rw-r--r-- | board/amcc/ebony/flash.c | 8 | ||||
| -rw-r--r-- | board/amcc/luan/flash.c | 8 | ||||
| -rw-r--r-- | board/amcc/ocotea/flash.c | 8 | ||||
| -rw-r--r-- | board/amcc/sequoia/sequoia.c | 4 | ||||
| -rw-r--r-- | board/amcc/taihu/flash.c | 8 | ||||
| -rw-r--r-- | board/amcc/walnut/flash.c | 8 | ||||
| -rw-r--r-- | board/amcc/yucca/flash.c | 10 | 
9 files changed, 36 insertions, 36 deletions
| diff --git a/board/amcc/bamboo/flash.c b/board/amcc/bamboo/flash.c index f23fc249c..d004ed785 100644 --- a/board/amcc/bamboo/flash.c +++ b/board/amcc/bamboo/flash.c @@ -154,12 +154,12 @@ unsigned long flash_init(void)  				    CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,  				    &flash_info[i]);  #if defined(CONFIG_ENV_IS_IN_FLASH) -		(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, -				    CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, +		(void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR, +				    CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,  				    &flash_info[i]); -#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR_REDUND) -		(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND, -				    CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1, +#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR_REDUND) +		(void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND, +				    CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1,  				    &flash_info[i]);  #endif  #endif diff --git a/board/amcc/bubinga/flash.c b/board/amcc/bubinga/flash.c index 0295b8c70..d71cc292e 100644 --- a/board/amcc/bubinga/flash.c +++ b/board/amcc/bubinga/flash.c @@ -85,11 +85,11 @@ unsigned long flash_init(void)  				    CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,  				    &flash_info[0]);  #ifdef CONFIG_ENV_IS_IN_FLASH -		(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, -				    CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, +		(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 diff --git a/board/amcc/ebony/flash.c b/board/amcc/ebony/flash.c index b49e05f6d..d9c69744b 100644 --- a/board/amcc/ebony/flash.c +++ b/board/amcc/ebony/flash.c @@ -125,11 +125,11 @@ unsigned long flash_init(void)  				    CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,  				    &flash_info[2]);  #ifdef CONFIG_ENV_IS_IN_FLASH -		(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, -				    CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, +		(void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR, +				    CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,  				    &flash_info[2]); -		(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[2]);  #endif diff --git a/board/amcc/luan/flash.c b/board/amcc/luan/flash.c index 3b2f9b746..d28bf9d23 100644 --- a/board/amcc/luan/flash.c +++ b/board/amcc/luan/flash.c @@ -96,11 +96,11 @@ unsigned long flash_init(void)  				    CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,  				    &flash_info[2]);  #ifdef CONFIG_ENV_IS_IN_FLASH -		(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, -				    CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, +		(void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR, +				    CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,  				    &flash_info[2]); -		(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[2]);  #endif diff --git a/board/amcc/ocotea/flash.c b/board/amcc/ocotea/flash.c index 88a76f7da..46c6946f3 100644 --- a/board/amcc/ocotea/flash.c +++ b/board/amcc/ocotea/flash.c @@ -135,11 +135,11 @@ unsigned long flash_init(void)  				    CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,  				    &flash_info[i]);  #ifdef CONFIG_ENV_IS_IN_FLASH -		(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, -				    CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, +		(void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR, +				    CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,  				    &flash_info[i]); -		(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[i]);  #endif diff --git a/board/amcc/sequoia/sequoia.c b/board/amcc/sequoia/sequoia.c index c682c8e3e..e439fb90e 100644 --- a/board/amcc/sequoia/sequoia.c +++ b/board/amcc/sequoia/sequoia.c @@ -166,8 +166,8 @@ int misc_init_r(void)  	/* Env protection ON by default */  	(void)flash_protect(FLAG_PROTECT_SET, -			    CFG_ENV_ADDR_REDUND, -			    CFG_ENV_ADDR_REDUND + 2*CFG_ENV_SECT_SIZE - 1, +			    CONFIG_ENV_ADDR_REDUND, +			    CONFIG_ENV_ADDR_REDUND + 2*CONFIG_ENV_SECT_SIZE - 1,  			    &flash_info[0]);  #endif diff --git a/board/amcc/taihu/flash.c b/board/amcc/taihu/flash.c index 8ffcc3934..ae92bb25b 100644 --- a/board/amcc/taihu/flash.c +++ b/board/amcc/taihu/flash.c @@ -88,11 +88,11 @@ unsigned long flash_init(void)  				    CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,  				    &flash_info[0]);  #ifdef CONFIG_ENV_IS_IN_FLASH -		(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, -				    CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, +		(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  		/* Also protect sector containing initial power-up instruction */ diff --git a/board/amcc/walnut/flash.c b/board/amcc/walnut/flash.c index d47d263e9..fe6ca6c5c 100644 --- a/board/amcc/walnut/flash.c +++ b/board/amcc/walnut/flash.c @@ -83,11 +83,11 @@ unsigned long flash_init(void)  				    CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,  				    &flash_info[0]);  #ifdef CONFIG_ENV_IS_IN_FLASH -		(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, -				    CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, +		(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 diff --git a/board/amcc/yucca/flash.c b/board/amcc/yucca/flash.c index 9256938dd..c4053465f 100644 --- a/board/amcc/yucca/flash.c +++ b/board/amcc/yucca/flash.c @@ -1038,12 +1038,12 @@ unsigned long flash_init(void)  				    CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,  				    &flash_info[i]);  #if defined(CONFIG_ENV_IS_IN_FLASH) -		(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, -				    CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, +		(void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR, +				    CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,  				    &flash_info[i]); -#if defined(CFG_ENV_ADDR_REDUND) -		(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND, -				    CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1, +#if defined(CONFIG_ENV_ADDR_REDUND) +		(void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND, +				    CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1,  				    &flash_info[i]);  #endif  #endif |