diff options
-rw-r--r-- | board/lpd7a40x/flash.c | 4 | ||||
-rw-r--r-- | board/mcc200/mcc200.c | 2 | ||||
-rw-r--r-- | board/netphone/flash.c | 4 | ||||
-rw-r--r-- | board/netta/flash.c | 4 | ||||
-rw-r--r-- | board/netta2/flash.c | 4 | ||||
-rw-r--r-- | board/netvia/flash.c | 4 | ||||
-rw-r--r-- | board/pleb2/flash.c | 4 | ||||
-rw-r--r-- | board/prodrive/pdnb3/flash.c | 2 | ||||
-rw-r--r-- | board/rmu/flash.c | 6 | ||||
-rw-r--r-- | board/samsung/smdk2400/flash.c | 4 | ||||
-rw-r--r-- | board/sixnet/flash.c | 4 | ||||
-rw-r--r-- | board/socrates/socrates.c | 2 | ||||
-rw-r--r-- | board/tqc/tqm85xx/tqm85xx.c | 2 | ||||
-rw-r--r-- | board/trab/flash.c | 4 | ||||
-rw-r--r-- | drivers/mtd/cfi_flash.c | 2 |
15 files changed, 26 insertions, 26 deletions
diff --git a/board/lpd7a40x/flash.c b/board/lpd7a40x/flash.c index a13b827fb2..a3ba75b893 100644 --- a/board/lpd7a40x/flash.c +++ b/board/lpd7a40x/flash.c @@ -98,12 +98,12 @@ ulong flash_init (void) flash_protect ( FLAG_PROTECT_SET, CONFIG_ENV_ADDR, - CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]); + CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1, &flash_info[0]); #ifdef CONFIG_ENV_ADDR_REDUND flash_protect ( FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND, - CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1, + CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1, &flash_info[0]); #endif diff --git a/board/mcc200/mcc200.c b/board/mcc200/mcc200.c index 14cf08da3f..9fa1d3ae75 100644 --- a/board/mcc200/mcc200.c +++ b/board/mcc200/mcc200.c @@ -270,7 +270,7 @@ int misc_init_r (void) /* Redundant environment protection ON by default */ flash_protect (FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND, - CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1, + CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1, &flash_info[CONFIG_SYS_MAX_FLASH_BANKS - 1]); } diff --git a/board/netphone/flash.c b/board/netphone/flash.c index 8852127e61..349d98e738 100644 --- a/board/netphone/flash.c +++ b/board/netphone/flash.c @@ -73,13 +73,13 @@ unsigned long flash_init(void) flash_protect ( FLAG_PROTECT_SET, CONFIG_ENV_ADDR, - CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, + CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1, &flash_info[0]); #ifdef CONFIG_ENV_ADDR_REDUND flash_protect ( FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND, - CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1, + CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1, &flash_info[0]); #endif diff --git a/board/netta/flash.c b/board/netta/flash.c index 45e6b30102..565fd67c6e 100644 --- a/board/netta/flash.c +++ b/board/netta/flash.c @@ -69,13 +69,13 @@ unsigned long flash_init(void) flash_protect ( FLAG_PROTECT_SET, CONFIG_ENV_ADDR, - CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, + CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1, &flash_info[0]); #ifdef CONFIG_ENV_ADDR_REDUND flash_protect ( FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND, - CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1, + CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1, &flash_info[0]); #endif diff --git a/board/netta2/flash.c b/board/netta2/flash.c index b63f459519..53a4e1eb20 100644 --- a/board/netta2/flash.c +++ b/board/netta2/flash.c @@ -70,13 +70,13 @@ unsigned long flash_init(void) flash_protect ( FLAG_PROTECT_SET, CONFIG_ENV_ADDR, - CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, + CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1, &flash_info[0]); #ifdef CONFIG_ENV_ADDR_REDUND flash_protect ( FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND, - CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1, + CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1, &flash_info[0]); #endif diff --git a/board/netvia/flash.c b/board/netvia/flash.c index 98479a50b8..b9874347b9 100644 --- a/board/netvia/flash.c +++ b/board/netvia/flash.c @@ -69,13 +69,13 @@ unsigned long flash_init(void) flash_protect ( FLAG_PROTECT_SET, CONFIG_ENV_ADDR, - CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, + CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1, &flash_info[0]); #ifdef CONFIG_ENV_ADDR_REDUND flash_protect ( FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND, - CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1, + CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1, &flash_info[0]); #endif diff --git a/board/pleb2/flash.c b/board/pleb2/flash.c index abaf0b4d24..a8897dcffe 100644 --- a/board/pleb2/flash.c +++ b/board/pleb2/flash.c @@ -110,13 +110,13 @@ unsigned long flash_init (void) #ifdef CONFIG_ENV_ADDR flash_protect (FLAG_PROTECT_SET, CONFIG_ENV_ADDR, - CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]); + CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1, &flash_info[0]); #endif #ifdef CONFIG_ENV_ADDR_REDUND flash_protect (FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND, - CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1, + CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1, &flash_info[0]); #endif diff --git a/board/prodrive/pdnb3/flash.c b/board/prodrive/pdnb3/flash.c index 351aed1e11..fe8d100083 100644 --- a/board/prodrive/pdnb3/flash.c +++ b/board/prodrive/pdnb3/flash.c @@ -78,7 +78,7 @@ unsigned long flash_init(void) /* Redundant environment protection ON by default */ flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND, - CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1, + CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1, &flash_info[CONFIG_SYS_MAX_FLASH_BANKS - 1]); flash_info[0].size = size; diff --git a/board/rmu/flash.c b/board/rmu/flash.c index a3ab851d2c..283b19d045 100644 --- a/board/rmu/flash.c +++ b/board/rmu/flash.c @@ -85,18 +85,18 @@ unsigned long flash_init (void) /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR, - CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1, + CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1, &flash_info[0]); #endif #if defined(CONFIG_ENV_ADDR_REDUND) || defined(CONFIG_ENV_OFFSET_REDUND) debug ("Protect redundand environment: %08lx ... %08lx\n", (ulong)CONFIG_ENV_ADDR_REDUND, - (ulong)CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE - 1); + (ulong)CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1); flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND, - CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1, + CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1, &flash_info[0]); #endif diff --git a/board/samsung/smdk2400/flash.c b/board/samsung/smdk2400/flash.c index 46b5786fe6..fb69c21a45 100644 --- a/board/samsung/smdk2400/flash.c +++ b/board/samsung/smdk2400/flash.c @@ -98,12 +98,12 @@ ulong flash_init (void) flash_protect ( FLAG_PROTECT_SET, CONFIG_ENV_ADDR, - CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]); + CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1, &flash_info[0]); #ifdef CONFIG_ENV_ADDR_REDUND flash_protect ( FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND, - CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1, + CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1, &flash_info[0]); #endif diff --git a/board/sixnet/flash.c b/board/sixnet/flash.c index a8dfca8246..20908021cd 100644 --- a/board/sixnet/flash.c +++ b/board/sixnet/flash.c @@ -111,13 +111,13 @@ unsigned long flash_init (void) #ifdef CONFIG_ENV_ADDR flash_protect ( FLAG_PROTECT_SET, CONFIG_ENV_ADDR, - CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]); + CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1, &flash_info[0]); #endif #ifdef CONFIG_ENV_ADDR_REDUND flash_protect ( FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND, - CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1, + CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1, &flash_info[0]); #endif diff --git a/board/socrates/socrates.c b/board/socrates/socrates.c index df9696e69a..51d66d517e 100644 --- a/board/socrates/socrates.c +++ b/board/socrates/socrates.c @@ -136,7 +136,7 @@ int misc_init_r (void) /* Redundant environment protection ON by default */ flash_protect (FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND, - CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1, + CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1, &flash_info[CONFIG_SYS_MAX_FLASH_BANKS - 1]); } diff --git a/board/tqc/tqm85xx/tqm85xx.c b/board/tqc/tqm85xx/tqm85xx.c index a70fd2694c..ab0e0dd883 100644 --- a/board/tqc/tqm85xx/tqm85xx.c +++ b/board/tqc/tqm85xx/tqm85xx.c @@ -328,7 +328,7 @@ int misc_init_r (void) /* Redundant environment protection ON by default */ flash_protect (FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND, - CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1, + CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1, &flash_info[CONFIG_SYS_MAX_FLASH_BANKS - 1]); #endif diff --git a/board/trab/flash.c b/board/trab/flash.c index 2bbb70b76d..4e89c41027 100644 --- a/board/trab/flash.c +++ b/board/trab/flash.c @@ -108,12 +108,12 @@ ulong flash_init (void) flash_protect ( FLAG_PROTECT_SET, CONFIG_ENV_ADDR, - CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]); + CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1, &flash_info[0]); #ifdef CONFIG_ENV_ADDR_REDUND flash_protect ( FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND, - CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1, + CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1, &flash_info[0]); #endif diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index 175d82a792..d0732f53fa 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -2098,7 +2098,7 @@ unsigned long flash_init (void) #ifdef CONFIG_ENV_ADDR_REDUND flash_protect (FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND, - CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1, + CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1, flash_get_info(CONFIG_ENV_ADDR_REDUND)); #endif |