diff options
Diffstat (limited to 'board')
92 files changed, 133 insertions, 132 deletions
diff --git a/board/LEOX/elpt860/flash.c b/board/LEOX/elpt860/flash.c index a9238e16cf..7107aaa6c2 100644 --- a/board/LEOX/elpt860/flash.c +++ b/board/LEOX/elpt860/flash.c @@ -118,7 +118,7 @@ flash_init (void) /* monitor protection ON by default */ flash_protect (FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE + CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE + monitor_flash_len-1, &flash_info[0]); #endif diff --git a/board/MAI/AmigaOneG3SE/flash_new.c b/board/MAI/AmigaOneG3SE/flash_new.c index 6eebeba0f2..3fb9f1246b 100644 --- a/board/MAI/AmigaOneG3SE/flash_new.c +++ b/board/MAI/AmigaOneG3SE/flash_new.c @@ -120,7 +120,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, + CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0]); #endif diff --git a/board/RPXClassic/flash.c b/board/RPXClassic/flash.c index 62934975fe..fdf90cfa94 100644 --- a/board/RPXClassic/flash.c +++ b/board/RPXClassic/flash.c @@ -64,7 +64,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); #endif diff --git a/board/RPXlite/flash.c b/board/RPXlite/flash.c index 78c1838b79..846794df3f 100644 --- a/board/RPXlite/flash.c +++ b/board/RPXlite/flash.c @@ -85,7 +85,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); #endif diff --git a/board/RRvision/flash.c b/board/RRvision/flash.c index 06f7c4b7ac..d8e07e6450 100644 --- a/board/RRvision/flash.c +++ b/board/RRvision/flash.c @@ -73,7 +73,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); #endif diff --git a/board/atc/flash.c b/board/atc/flash.c index 7e971822e0..6d7b38bde8 100644 --- a/board/atc/flash.c +++ b/board/atc/flash.c @@ -91,7 +91,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, flash_get_info(CFG_MONITOR_BASE)); #endif diff --git a/board/bmw/flash.c b/board/bmw/flash.c index 6a7649ffe5..be622743f0 100644 --- a/board/bmw/flash.c +++ b/board/bmw/flash.c @@ -219,7 +219,7 @@ flash_init(void) #if CFG_MONITOR_BASE >= CFG_FLASH_BASE flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, + CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0]); #endif diff --git a/board/c2mon/flash.c b/board/c2mon/flash.c index 181f82af2f..b2be21c684 100644 --- a/board/c2mon/flash.c +++ b/board/c2mon/flash.c @@ -91,7 +91,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); #endif @@ -118,7 +118,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[1]); #endif diff --git a/board/cmi/flash.c b/board/cmi/flash.c index b41ff12520..9c802b9131 100644 --- a/board/cmi/flash.c +++ b/board/cmi/flash.c @@ -106,7 +106,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); #endif diff --git a/board/cogent/flash.c b/board/cogent/flash.c index 86da80edb8..969520d277 100644 --- a/board/cogent/flash.c +++ b/board/cogent/flash.c @@ -323,7 +323,7 @@ flash_init(void) #if CFG_MONITOR_BASE == CFG_FLASH_BASE flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); #endif diff --git a/board/cpc45/flash.c b/board/cpc45/flash.c index 6e81b9c335..a289d08942 100644 --- a/board/cpc45/flash.c +++ b/board/cpc45/flash.c @@ -132,12 +132,12 @@ unsigned long flash_init(void) #if CFG_MONITOR_BASE >= CFG_FLASH_BASE + FLASH_BANK_SIZE flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, + CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[1]); #else flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, + CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0]); #endif #endif diff --git a/board/cpu86/flash.c b/board/cpu86/flash.c index 8cf761f1e6..0769dc5c62 100644 --- a/board/cpu86/flash.c +++ b/board/cpu86/flash.c @@ -218,14 +218,14 @@ unsigned long flash_init (void) flash_protect (FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, &flash_info[1] + CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[1] ); } #else #if CFG_MONITOR_BASE >= CFG_FLASH_BASE flash_protect (FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, &flash_info[0] + CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0] ); #endif #endif diff --git a/board/cradle/flash.c b/board/cradle/flash.c index 265b609648..463026d0ea 100644 --- a/board/cradle/flash.c +++ b/board/cradle/flash.c @@ -73,7 +73,7 @@ ulong flash_init(void) */ flash_protect(FLAG_PROTECT_SET, CFG_FLASH_BASE, - CFG_FLASH_BASE + _armboot_end_data - _armboot_start, + CFG_FLASH_BASE + monitor_flash_len - 1, &flash_info[0]); flash_protect(FLAG_PROTECT_SET, diff --git a/board/cray/L1/flash.c b/board/cray/L1/flash.c index 6d66905d9a..829dbaecbe 100644 --- a/board/cray/L1/flash.c +++ b/board/cray/L1/flash.c @@ -88,7 +88,7 @@ unsigned long flash_init (void) /* Monitor protection ON by default */ (void)flash_protect(FLAG_PROTECT_SET, FLASH_BASE0_PRELIM, - FLASH_BASE0_PRELIM+CFG_MONITOR_LEN-1, + FLASH_BASE0_PRELIM+monitor_flash_len-1, &flash_info[0]); #endif size_b1 = 0 ; diff --git a/board/csb226/flash.c b/board/csb226/flash.c index c6cb95e2f3..0ee78e6f2f 100644 --- a/board/csb226/flash.c +++ b/board/csb226/flash.c @@ -74,7 +74,7 @@ ulong flash_init(void) /* Protect monitor and environment sectors */ flash_protect(FLAG_PROTECT_SET, CFG_FLASH_BASE, - CFG_FLASH_BASE + _armboot_end_data - _armboot_start, + CFG_FLASH_BASE + monitor_flash_len - 1, &flash_info[0]); flash_protect(FLAG_PROTECT_SET, diff --git a/board/cu824/flash.c b/board/cu824/flash.c index 0cec41ebdb..61b759ec57 100644 --- a/board/cu824/flash.c +++ b/board/cu824/flash.c @@ -125,12 +125,12 @@ unsigned long flash_init(void) #if CFG_MONITOR_BASE >= CFG_FLASH_BASE + FLASH_BANK_SIZE flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, + CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[1]); #else flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, + CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0]); #endif #endif diff --git a/board/dnp1110/flash.c b/board/dnp1110/flash.c index bb6d2e7995..f4a8b999c6 100644 --- a/board/dnp1110/flash.c +++ b/board/dnp1110/flash.c @@ -84,7 +84,7 @@ unsigned long flash_init (void) */ flash_protect(FLAG_PROTECT_SET, CFG_FLASH_BASE, - CFG_FLASH_BASE + _armboot_end_data - _armboot_start, + CFG_FLASH_BASE + monitor_flash_len - 1, &flash_info[0]); flash_protect(FLAG_PROTECT_SET, diff --git a/board/eltec/bab7xx/flash.c b/board/eltec/bab7xx/flash.c index 5834c99999..73496a13de 100644 --- a/board/eltec/bab7xx/flash.c +++ b/board/eltec/bab7xx/flash.c @@ -83,21 +83,21 @@ unsigned long flash_init (void) { (void)flash_protect(FLAG_PROTECT_SET, FLASH_BASE0_PRELIM, - FLASH_BASE0_PRELIM+CFG_MONITOR_LEN-1, + FLASH_BASE0_PRELIM+monitor_flash_len-1, &flash_info[0]); } if (size2 == 512*1024) { (void)flash_protect(FLAG_PROTECT_SET, FLASH_BASE1_PRELIM, - FLASH_BASE1_PRELIM+CFG_MONITOR_LEN-1, + FLASH_BASE1_PRELIM+monitor_flash_len-1, &flash_info[1]); } if (size2 == 4*1024*1024) { (void)flash_protect(FLAG_PROTECT_SET, CFG_FLASH_BASE, - CFG_FLASH_BASE+CFG_MONITOR_LEN-1, + CFG_FLASH_BASE+monitor_flash_len-1, &flash_info[1]); } diff --git a/board/eltec/elppc/flash.c b/board/eltec/elppc/flash.c index 5834c99999..73496a13de 100644 --- a/board/eltec/elppc/flash.c +++ b/board/eltec/elppc/flash.c @@ -83,21 +83,21 @@ unsigned long flash_init (void) { (void)flash_protect(FLAG_PROTECT_SET, FLASH_BASE0_PRELIM, - FLASH_BASE0_PRELIM+CFG_MONITOR_LEN-1, + FLASH_BASE0_PRELIM+monitor_flash_len-1, &flash_info[0]); } if (size2 == 512*1024) { (void)flash_protect(FLAG_PROTECT_SET, FLASH_BASE1_PRELIM, - FLASH_BASE1_PRELIM+CFG_MONITOR_LEN-1, + FLASH_BASE1_PRELIM+monitor_flash_len-1, &flash_info[1]); } if (size2 == 4*1024*1024) { (void)flash_protect(FLAG_PROTECT_SET, CFG_FLASH_BASE, - CFG_FLASH_BASE+CFG_MONITOR_LEN-1, + CFG_FLASH_BASE+monitor_flash_len-1, &flash_info[1]); } diff --git a/board/eltec/mhpc/flash.c b/board/eltec/mhpc/flash.c index 58cfd7047f..e9c8f9862d 100644 --- a/board/eltec/mhpc/flash.c +++ b/board/eltec/mhpc/flash.c @@ -92,7 +92,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ (void)flash_protect(FLAG_PROTECT_SET, CFG_FLASH_BASE, - CFG_FLASH_BASE+CFG_MONITOR_LEN-1, + CFG_FLASH_BASE+monitor_flash_len-1, &flash_info[0]); flash_info[0].size = size_b0; diff --git a/board/ep7312/flash.c b/board/ep7312/flash.c index 373d238ccf..1ee0a37a00 100644 --- a/board/ep7312/flash.c +++ b/board/ep7312/flash.c @@ -61,7 +61,7 @@ ulong flash_init (void) */ flash_protect ( FLAG_PROTECT_SET, CFG_FLASH_BASE, - CFG_FLASH_BASE + _armboot_end_data - _armboot_start, + CFG_FLASH_BASE + monitor_flash_len - 1, &flash_info[0]); flash_protect ( FLAG_PROTECT_SET, diff --git a/board/ep8260/flash.c b/board/ep8260/flash.c index cae8a13dde..d9dbdbee92 100644 --- a/board/ep8260/flash.c +++ b/board/ep8260/flash.c @@ -140,7 +140,7 @@ unsigned long flash_init (void) #if CFG_MONITOR_BASE >= CFG_FLASH0_BASE flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); #endif diff --git a/board/eric/flash.c b/board/eric/flash.c index c3f6e15bc5..5dfb620c6c 100644 --- a/board/eric/flash.c +++ b/board/eric/flash.c @@ -83,13 +83,13 @@ unsigned long flash_init (void) /* Monitor protection ON by default */ #if 0 /* sand: */ (void)flash_protect(FLAG_PROTECT_SET, - FLASH_BASE0_PRELIM-CFG_MONITOR_LEN+size_b0, + FLASH_BASE0_PRELIM-monitor_flash_len+size_b0, FLASH_BASE0_PRELIM-1+size_b0, &flash_info[0]); #else (void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); #endif size_b1 = 0 ; @@ -132,13 +132,13 @@ unsigned long flash_init (void) /* monitor protection ON by default */ #if 0 /* sand: */ (void)flash_protect(FLAG_PROTECT_SET, - FLASH_BASE0_PRELIM-CFG_MONITOR_LEN+size_b0, + FLASH_BASE0_PRELIM-monitor_flash_len+size_b0, FLASH_BASE0_PRELIM-1+size_b0, &flash_info[0]); #else (void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); #endif @@ -150,12 +150,12 @@ unsigned long flash_init (void) /* monitor protection ON by default */ (void)flash_protect(FLAG_PROTECT_SET, - base_b1+size_b1-CFG_MONITOR_LEN, + base_b1+size_b1-monitor_flash_len, base_b1+size_b1-1, &flash_info[1]); /* monitor protection OFF by default (one is enough) */ (void)flash_protect(FLAG_PROTECT_CLEAR, - base_b0+size_b0-CFG_MONITOR_LEN, + base_b0+size_b0-monitor_flash_len, base_b0+size_b0-1, &flash_info[0]); } else { diff --git a/board/esd/adciop/flash.c b/board/esd/adciop/flash.c index 46ae03b3c0..69618de1fc 100644 --- a/board/esd/adciop/flash.c +++ b/board/esd/adciop/flash.c @@ -80,7 +80,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, - FLASH_BASE0_PRELIM+size_b0-CFG_MONITOR_LEN, + FLASH_BASE0_PRELIM+size_b0-monitor_flash_len, FLASH_BASE0_PRELIM+size_b0-1, &flash_info[0]); @@ -93,12 +93,12 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, - FLASH_BASE0_PRELIM+size_b0+size_b1-CFG_MONITOR_LEN, + FLASH_BASE0_PRELIM+size_b0+size_b1-monitor_flash_len, FLASH_BASE0_PRELIM+size_b0+size_b1-1, &flash_info[1]); /* monitor protection OFF by default (one is enough) */ flash_protect(FLAG_PROTECT_CLEAR, - FLASH_BASE0_PRELIM+size_b0-CFG_MONITOR_LEN, + FLASH_BASE0_PRELIM+size_b0-monitor_flash_len, FLASH_BASE0_PRELIM+size_b0-1, &flash_info[0]); } else { diff --git a/board/esd/ar405/flash.c b/board/esd/ar405/flash.c index 4fa6b2733f..3a644f9cc5 100644 --- a/board/esd/ar405/flash.c +++ b/board/esd/ar405/flash.c @@ -94,7 +94,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ (void)flash_protect(FLAG_PROTECT_SET, - base_b0+size_b0-CFG_MONITOR_LEN, + base_b0+size_b0-monitor_flash_len, base_b0+size_b0-1, &flash_info[0]); @@ -106,12 +106,12 @@ unsigned long flash_init (void) /* monitor protection ON by default */ (void)flash_protect(FLAG_PROTECT_SET, - base_b1+size_b1-CFG_MONITOR_LEN, + base_b1+size_b1-monitor_flash_len, base_b1+size_b1-1, &flash_info[1]); /* monitor protection OFF by default (one is enough) */ (void)flash_protect(FLAG_PROTECT_CLEAR, - base_b0+size_b0-CFG_MONITOR_LEN, + base_b0+size_b0-monitor_flash_len, base_b0+size_b0-1, &flash_info[0]); } else { diff --git a/board/esd/canbt/flash.c b/board/esd/canbt/flash.c index 214948f6d8..685850e84f 100644 --- a/board/esd/canbt/flash.c +++ b/board/esd/canbt/flash.c @@ -74,7 +74,7 @@ unsigned long flash_init (void) /* Monitor protection ON by default */ (void)flash_protect(FLAG_PROTECT_SET, - -CFG_MONITOR_LEN, + -monitor_flash_len, 0xffffffff, &flash_info[0]); diff --git a/board/esd/cpci405/flash.c b/board/esd/cpci405/flash.c index 02de050b74..e766895bb0 100644 --- a/board/esd/cpci405/flash.c +++ b/board/esd/cpci405/flash.c @@ -125,7 +125,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect (FLAG_PROTECT_SET, - base_b0 + size_b0 - CFG_MONITOR_LEN, + base_b0 + size_b0 - monitor_flash_len, base_b0 + size_b0 - 1, &flash_info[0]); if (size_b1) { @@ -136,11 +136,11 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect (FLAG_PROTECT_SET, - base_b1 + size_b1 - CFG_MONITOR_LEN, + base_b1 + size_b1 - monitor_flash_len, base_b1 + size_b1 - 1, &flash_info[1]); /* monitor protection OFF by default (one is enough) */ flash_protect (FLAG_PROTECT_CLEAR, - base_b0 + size_b0 - CFG_MONITOR_LEN, + base_b0 + size_b0 - monitor_flash_len, base_b0 + size_b0 - 1, &flash_info[0]); } else { flash_info[1].flash_id = FLASH_UNKNOWN; diff --git a/board/esd/cpci440/strataflash.c b/board/esd/cpci440/strataflash.c index 6f6286694b..de57318e26 100644 --- a/board/esd/cpci440/strataflash.c +++ b/board/esd/cpci440/strataflash.c @@ -200,7 +200,7 @@ unsigned long flash_init (void) #if 0 /* test-only */ /* Monitor protection ON by default */ #if (CFG_MONITOR_BASE >= CFG_FLASH_BASE) - for(i=0; flash_info[0].start[i] < CFG_MONITOR_BASE+CFG_MONITOR_LEN-1; i++) + for(i=0; flash_info[0].start[i] < CFG_MONITOR_BASE+monitor_flash_len-1; i++) (void)flash_real_protect(&flash_info[0], i, 1); #endif #endif diff --git a/board/esd/cpciiser4/flash.c b/board/esd/cpciiser4/flash.c index 214948f6d8..685850e84f 100644 --- a/board/esd/cpciiser4/flash.c +++ b/board/esd/cpciiser4/flash.c @@ -74,7 +74,7 @@ unsigned long flash_init (void) /* Monitor protection ON by default */ (void)flash_protect(FLAG_PROTECT_SET, - -CFG_MONITOR_LEN, + -monitor_flash_len, 0xffffffff, &flash_info[0]); diff --git a/board/esd/dasa_sim/flash.c b/board/esd/dasa_sim/flash.c index 2574eac7fd..32cd64cf08 100644 --- a/board/esd/dasa_sim/flash.c +++ b/board/esd/dasa_sim/flash.c @@ -67,7 +67,7 @@ unsigned long flash_init (void) /* Monitor protection ON by default */ (void)flash_protect(FLAG_PROTECT_SET, - -CFG_MONITOR_LEN, + -monitor_flash_len, 0xffffffff, &flash_info[0]); diff --git a/board/esd/du405/flash.c b/board/esd/du405/flash.c index 97d832228e..14549c0147 100644 --- a/board/esd/du405/flash.c +++ b/board/esd/du405/flash.c @@ -94,7 +94,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect (FLAG_PROTECT_SET, - base_b0 + size_b0 - CFG_MONITOR_LEN, + base_b0 + size_b0 - monitor_flash_len, base_b0 + size_b0 - 1, &flash_info[0]); if (size_b1) { @@ -105,11 +105,11 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect (FLAG_PROTECT_SET, - base_b1 + size_b1 - CFG_MONITOR_LEN, + base_b1 + size_b1 - monitor_flash_len, base_b1 + size_b1 - 1, &flash_info[1]); /* monitor protection OFF by default (one is enough) */ flash_protect (FLAG_PROTECT_CLEAR, - base_b0 + size_b0 - CFG_MONITOR_LEN, + base_b0 + size_b0 - monitor_flash_len, base_b0 + size_b0 - 1, &flash_info[0]); } else { flash_info[1].flash_id = FLASH_UNKNOWN; diff --git a/board/esd/ocrtc/flash.c b/board/esd/ocrtc/flash.c index 90965eadf5..c3d8bec913 100644 --- a/board/esd/ocrtc/flash.c +++ b/board/esd/ocrtc/flash.c @@ -127,7 +127,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect (FLAG_PROTECT_SET, - base_b0 + size_b0 - CFG_MONITOR_LEN, + base_b0 + size_b0 - monitor_flash_len, base_b0 + size_b0 - 1, &flash_info[0]); if (size_b1) { @@ -138,11 +138,11 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect (FLAG_PROTECT_SET, - base_b1 + size_b1 - CFG_MONITOR_LEN, + base_b1 + size_b1 - monitor_flash_len, base_b1 + size_b1 - 1, &flash_info[1]); /* monitor protection OFF by default (one is enough) */ flash_protect (FLAG_PROTECT_CLEAR, - base_b0 + size_b0 - CFG_MONITOR_LEN, + base_b0 + size_b0 - monitor_flash_len, base_b0 + size_b0 - 1, &flash_info[0]); } else { flash_info[1].flash_id = FLASH_UNKNOWN; diff --git a/board/esd/pci405/flash.c b/board/esd/pci405/flash.c index f904affc4f..1707dcf6e1 100644 --- a/board/esd/pci405/flash.c +++ b/board/esd/pci405/flash.c @@ -91,7 +91,7 @@ unsigned long flash_init (void) /* Monitor protection ON by default */ (void)flash_protect(FLAG_PROTECT_SET, - -CFG_MONITOR_LEN, + -monitor_flash_len, 0xffffffff, &flash_info[0]); diff --git a/board/esteem192e/flash.c b/board/esteem192e/flash.c index 55845fac11..5322430de3 100644 --- a/board/esteem192e/flash.c +++ b/board/esteem192e/flash.c @@ -104,7 +104,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ (void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); #endif @@ -124,7 +124,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ (void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[1]); #endif } else { diff --git a/board/etx094/flash.c b/board/etx094/flash.c index b3c620e868..98a7c0c8d7 100644 --- a/board/etx094/flash.c +++ b/board/etx094/flash.c @@ -91,7 +91,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); #endif @@ -115,7 +115,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[1]); #endif } else { diff --git a/board/fads/flash.c b/board/fads/flash.c index 22a7c410ce..680a2dc93c 100644 --- a/board/fads/flash.c +++ b/board/fads/flash.c @@ -112,7 +112,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[i]); #endif diff --git a/board/flagadm/flash.c b/board/flagadm/flash.c index fc5d963a91..fd0082c135 100644 --- a/board/flagadm/flash.c +++ b/board/flagadm/flash.c @@ -77,7 +77,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); #endif diff --git a/board/gen860t/flash.c b/board/gen860t/flash.c index 902b1b0afe..ec32d07dbf 100644 --- a/board/gen860t/flash.c +++ b/board/gen860t/flash.c @@ -157,7 +157,7 @@ flash_init (void) */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, + CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0]); #endif diff --git a/board/genietv/flash.c b/board/genietv/flash.c index 2314a53e73..f12d0be552 100644 --- a/board/genietv/flash.c +++ b/board/genietv/flash.c @@ -55,7 +55,7 @@ unsigned long flash_init (void) /* Monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); #endif diff --git a/board/gth/flash.c b/board/gth/flash.c index 562a349924..c8b56fb96b 100644 --- a/board/gth/flash.c +++ b/board/gth/flash.c @@ -102,7 +102,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ (void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); #endif @@ -121,7 +121,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ (void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[1]); #endif } diff --git a/board/gw8260/flash.c b/board/gw8260/flash.c index 532dd194d7..5620a1d8b7 100644 --- a/board/gw8260/flash.c +++ b/board/gw8260/flash.c @@ -96,7 +96,7 @@ unsigned long flash_init (void) #if CFG_MONITOR_BASE >= CFG_FLASH0_BASE flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); #endif diff --git a/board/hermes/flash.c b/board/hermes/flash.c index bb7635ecfe..799fe83f3e 100644 --- a/board/hermes/flash.c +++ b/board/hermes/flash.c @@ -71,7 +71,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); #endif diff --git a/board/hymod/flash.c b/board/hymod/flash.c index ee052e3959..0a09b4a70e 100644 --- a/board/hymod/flash.c +++ b/board/hymod/flash.c @@ -321,7 +321,7 @@ flash_init(void) #if CFG_MONITOR_BASE == CFG_FLASH_BASE (void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); #endif diff --git a/board/icu862/flash.c b/board/icu862/flash.c index 79e7cc28ae..6315bd95b1 100644 --- a/board/icu862/flash.c +++ b/board/icu862/flash.c @@ -104,7 +104,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); #endif diff --git a/board/impa7/flash.c b/board/impa7/flash.c index c59ffb8658..7db0b3289d 100644 --- a/board/impa7/flash.c +++ b/board/impa7/flash.c @@ -72,7 +72,7 @@ ulong flash_init(void) */ flash_protect(FLAG_PROTECT_SET, CFG_FLASH_BASE, - CFG_FLASH_BASE + _armboot_end_data - _armboot_start, + CFG_FLASH_BASE + monitor_flash_len - 1, &flash_info[0]); flash_protect(FLAG_PROTECT_SET, diff --git a/board/incaip/flash.c b/board/incaip/flash.c index 427f14a616..e7fd54063b 100644 --- a/board/incaip/flash.c +++ b/board/incaip/flash.c @@ -100,7 +100,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, flash_get_info(CFG_MONITOR_BASE)); #endif diff --git a/board/ip860/flash.c b/board/ip860/flash.c index 4b0ea9bb01..2cf23b3e8c 100644 --- a/board/ip860/flash.c +++ b/board/ip860/flash.c @@ -90,7 +90,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); #endif diff --git a/board/iphase4539/flash.c b/board/iphase4539/flash.c index 401ffbe415..4eca46720c 100644 --- a/board/iphase4539/flash.c +++ b/board/iphase4539/flash.c @@ -71,7 +71,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, + CFG_MONITOR_BASE + monitor_flash_len - 1, flash_info + bank); #endif diff --git a/board/ivm/flash.c b/board/ivm/flash.c index b5453dff1e..140ba2d530 100644 --- a/board/ivm/flash.c +++ b/board/ivm/flash.c @@ -87,7 +87,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); #endif diff --git a/board/kup4k/flash.c b/board/kup4k/flash.c index 3837457687..7297c159e0 100644 --- a/board/kup4k/flash.c +++ b/board/kup4k/flash.c @@ -74,7 +74,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); #endif diff --git a/board/lantec/flash.c b/board/lantec/flash.c index df58510333..0faa82cba4 100644 --- a/board/lantec/flash.c +++ b/board/lantec/flash.c @@ -134,7 +134,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); #endif @@ -166,7 +166,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[1]); #endif diff --git a/board/lart/flash.c b/board/lart/flash.c index 7b19524139..89ab62c536 100644 --- a/board/lart/flash.c +++ b/board/lart/flash.c @@ -105,7 +105,7 @@ ulong flash_init(void) */ flash_protect(FLAG_PROTECT_SET, CFG_FLASH_BASE, - CFG_FLASH_BASE + _armboot_end_data - _armboot_start, + CFG_FLASH_BASE + monitor_flash_len - 1, &flash_info[0]); flash_protect(FLAG_PROTECT_SET, diff --git a/board/lubbock/flash.c b/board/lubbock/flash.c index dcf829b2c5..9e07b1140d 100644 --- a/board/lubbock/flash.c +++ b/board/lubbock/flash.c @@ -86,7 +86,7 @@ unsigned long flash_init (void) */ flash_protect ( FLAG_PROTECT_SET, CFG_FLASH_BASE, - CFG_FLASH_BASE + _armboot_end_data - _armboot_start, + CFG_FLASH_BASE + monitor_flash_len - 1, &flash_info[0] ); flash_protect ( FLAG_PROTECT_SET, diff --git a/board/lwmon/flash.c b/board/lwmon/flash.c index 3d2a00fd3e..127738a4bb 100644 --- a/board/lwmon/flash.c +++ b/board/lwmon/flash.c @@ -123,7 +123,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); #endif @@ -156,7 +156,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[1]); #endif diff --git a/board/mbx8xx/flash.c b/board/mbx8xx/flash.c index e1aa47bbaa..a491f7bf0b 100644 --- a/board/mbx8xx/flash.c +++ b/board/mbx8xx/flash.c @@ -79,7 +79,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); #endif diff --git a/board/mpc8260ads/flash.c b/board/mpc8260ads/flash.c index ec6a3b3fed..d61bfc6462 100644 --- a/board/mpc8260ads/flash.c +++ b/board/mpc8260ads/flash.c @@ -100,7 +100,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); #endif diff --git a/board/mpc8266ads/flash.c b/board/mpc8266ads/flash.c index b876d1cddd..9512c72a0b 100644 --- a/board/mpc8266ads/flash.c +++ b/board/mpc8266ads/flash.c @@ -101,7 +101,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); #endif diff --git a/board/mpl/common/flash.c b/board/mpl/common/flash.c index 483d0fff34..563039b9cd 100644 --- a/board/mpl/common/flash.c +++ b/board/mpl/common/flash.c @@ -102,7 +102,7 @@ unsigned long flash_init (void) #if CFG_MONITOR_BASE >= CFG_FLASH_BASE flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); #endif size_b1 = 0 ; diff --git a/board/mpl/vcma9/flash.c b/board/mpl/vcma9/flash.c index c2075da2a5..b442c9d287 100644 --- a/board/mpl/vcma9/flash.c +++ b/board/mpl/vcma9/flash.c @@ -113,7 +113,7 @@ ulong flash_init(void) flash_protect(FLAG_PROTECT_SET, CFG_FLASH_BASE, - CFG_FLASH_BASE + _armboot_end - _armboot_start, + CFG_FLASH_BASE + monitor_flash_len - 1, &flash_info[0]); flash_protect(FLAG_PROTECT_SET, diff --git a/board/musenki/flash.c b/board/musenki/flash.c index a0a038f753..1e8bfff8c6 100644 --- a/board/musenki/flash.c +++ b/board/musenki/flash.c @@ -146,11 +146,11 @@ unsigned long flash_init (void) flash_info[0].size = size_b0; #if CFG_MONITOR_BASE >= CFG_FLASH_BASE - DEBUGF("protect monitor %x @ %x\n", CFG_MONITOR_BASE, CFG_MONITOR_LEN); + DEBUGF("protect monitor %x @ %x\n", CFG_MONITOR_BASE, monitor_flash_len); /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); #endif @@ -171,7 +171,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[1]); #endif diff --git a/board/mvs1/flash.c b/board/mvs1/flash.c index 75d9048bac..0845943587 100644 --- a/board/mvs1/flash.c +++ b/board/mvs1/flash.c @@ -115,7 +115,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_FLASH_BASE, - CFG_FLASH_BASE+CFG_MONITOR_LEN-1, + CFG_FLASH_BASE+monitor_flash_len-1, &flash_info[0]); if (size_b1) { @@ -136,7 +136,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_FLASH_BASE, - CFG_FLASH_BASE+CFG_MONITOR_LEN-1, + CFG_FLASH_BASE+monitor_flash_len-1, &flash_info[1]); } else { memctl->memc_br1 = 0; /* invalidate bank */ diff --git a/board/netvia/flash.c b/board/netvia/flash.c index 4204c34193..669031f735 100644 --- a/board/netvia/flash.c +++ b/board/netvia/flash.c @@ -66,7 +66,7 @@ unsigned long flash_init(void) flash_get_offsets(CFG_FLASH_BASE, &flash_info[0]); /* monitor protection ON by default */ - flash_protect(FLAG_PROTECT_SET, CFG_FLASH_BASE, CFG_FLASH_BASE + CFG_MONITOR_LEN - 1, &flash_info[0]); + flash_protect(FLAG_PROTECT_SET, CFG_FLASH_BASE, CFG_FLASH_BASE + monitor_flash_len - 1, &flash_info[0]); flash_info[0].size = size; diff --git a/board/nx823/flash.c b/board/nx823/flash.c index 616a13f2c6..05ec687929 100644 --- a/board/nx823/flash.c +++ b/board/nx823/flash.c @@ -93,7 +93,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ (void)flash_protect(FLAG_PROTECT_SET, CFG_FLASH_BASE, - CFG_FLASH_BASE+CFG_MONITOR_LEN-1, + CFG_FLASH_BASE+monitor_flash_len-1, &flash_info[0]); flash_info[0].size = size_b0; diff --git a/board/oxc/flash.c b/board/oxc/flash.c index 4f0220eab6..795b7ccff9 100644 --- a/board/oxc/flash.c +++ b/board/oxc/flash.c @@ -69,7 +69,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); #endif diff --git a/board/pcippc2/flash.c b/board/pcippc2/flash.c index 20f4d0343b..6e9e3395c1 100644 --- a/board/pcippc2/flash.c +++ b/board/pcippc2/flash.c @@ -70,7 +70,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, + CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0]); #endif diff --git a/board/pm826/flash.c b/board/pm826/flash.c index 4d5147bf78..770a46db73 100644 --- a/board/pm826/flash.c +++ b/board/pm826/flash.c @@ -133,7 +133,7 @@ unsigned long flash_init (void) # if CFG_MONITOR_BASE >= CFG_FLASH0_BASE flash_protect (FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, &flash_info[0] + CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0] ); # endif #endif /* CONFIG_BOOT_ROM */ diff --git a/board/ppmc8260/strataflash.c b/board/ppmc8260/strataflash.c index bb2184895b..6d5a853829 100644 --- a/board/ppmc8260/strataflash.c +++ b/board/ppmc8260/strataflash.c @@ -201,7 +201,7 @@ unsigned long flash_init (void) /* Monitor protection ON by default */ #if (CFG_MONITOR_BASE >= CFG_FLASH_BASE) - for(i=0; flash_info[0].start[i] < CFG_MONITOR_BASE+CFG_MONITOR_LEN-1; i++) + for(i=0; flash_info[0].start[i] < CFG_MONITOR_BASE+monitor_flash_len-1; i++) (void)flash_real_protect(&flash_info[0], i, 1); #endif diff --git a/board/purple/flash.c b/board/purple/flash.c index 56d3acd160..34f1b91c40 100644 --- a/board/purple/flash.c +++ b/board/purple/flash.c @@ -233,7 +233,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, flash_get_info(CFG_MONITOR_BASE)); #endif diff --git a/board/purple/purple.c b/board/purple/purple.c index dfd014b53b..b1eb78f0e6 100644 --- a/board/purple/purple.c +++ b/board/purple/purple.c @@ -232,6 +232,7 @@ static void programLoad(void) */ void copy_code (ulong dest_addr) { + extern long uboot_end_data; unsigned long start; unsigned long end; @@ -243,7 +244,7 @@ void copy_code (ulong dest_addr) */ copyLongs((ulong *)CFG_MONITOR_BASE, (ulong *)dest_addr, - (CFG_MONITOR_LEN + 3) / 4); + ((ulong)&uboot_end_data - CFG_MONITOR_BASE + 3) / 4); /* flush caches diff --git a/board/r360mpi/flash.c b/board/r360mpi/flash.c index fef483c3f8..9b42960c7d 100644 --- a/board/r360mpi/flash.c +++ b/board/r360mpi/flash.c @@ -107,7 +107,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ (void) flash_protect (FLAG_PROTECT_SET, CFG_FLASH_BASE, - CFG_FLASH_BASE + CFG_MONITOR_LEN - 1, + CFG_FLASH_BASE + monitor_flash_len - 1, &flash_info[0]); #endif diff --git a/board/rpxsuper/flash.c b/board/rpxsuper/flash.c index 0c298ba858..73281bd4e2 100644 --- a/board/rpxsuper/flash.c +++ b/board/rpxsuper/flash.c @@ -67,7 +67,7 @@ unsigned long flash_init (void) #if CFG_MONITOR_BASE >= CFG_FLASH0_BASE flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); #endif diff --git a/board/rsdproto/flash.c b/board/rsdproto/flash.c index 654012f607..d90e7db547 100644 --- a/board/rsdproto/flash.c +++ b/board/rsdproto/flash.c @@ -123,11 +123,11 @@ unsigned long flash_init (void) #if CFG_MONITOR_BASE >= PHYS_FLASH flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[1]); #endif diff --git a/board/sacsng/flash.c b/board/sacsng/flash.c index 4fd04dfc06..52e01def5b 100644 --- a/board/sacsng/flash.c +++ b/board/sacsng/flash.c @@ -69,7 +69,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); #endif @@ -86,7 +86,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[1]); #endif diff --git a/board/sandpoint/flash.c b/board/sandpoint/flash.c index 572199dd0a..4b6f2d0678 100644 --- a/board/sandpoint/flash.c +++ b/board/sandpoint/flash.c @@ -228,7 +228,7 @@ flash_init(void) #if CFG_MONITOR_BASE >= CFG_FLASH_BASE flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, + CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0]); #endif diff --git a/board/sbc8260/flash.c b/board/sbc8260/flash.c index ab2bf354c3..9a8b95225f 100644 --- a/board/sbc8260/flash.c +++ b/board/sbc8260/flash.c @@ -63,7 +63,7 @@ unsigned long flash_init (void) #if CFG_MONITOR_BASE >= CFG_FLASH0_BASE flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); #endif diff --git a/board/shannon/flash.c b/board/shannon/flash.c index 8e0f752193..c340fea52c 100644 --- a/board/shannon/flash.c +++ b/board/shannon/flash.c @@ -124,7 +124,7 @@ ulong flash_init(void) #else flash_protect(FLAG_PROTECT_SET, CFG_FLASH_BASE, - CFG_FLASH_BASE + _armboot_end_data - _armboot_start, + CFG_FLASH_BASE + monitor_flash_len - 1, &flash_info[0]); flash_protect(FLAG_PROTECT_SET, diff --git a/board/siemens/CCM/flash.c b/board/siemens/CCM/flash.c index e56114f80c..9c32785b48 100644 --- a/board/siemens/CCM/flash.c +++ b/board/siemens/CCM/flash.c @@ -87,7 +87,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); #endif @@ -106,7 +106,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[1]); #endif } else { diff --git a/board/siemens/SCM/flash.c b/board/siemens/SCM/flash.c index dd7a4cc838..056fe810b3 100644 --- a/board/siemens/SCM/flash.c +++ b/board/siemens/SCM/flash.c @@ -204,7 +204,7 @@ unsigned long flash_init (void) #if CFG_MONITOR_BASE >= CFG_FLASH0_BASE flash_protect (FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, &flash_info[0]); + CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0]); #endif #if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR) diff --git a/board/siemens/pcu_e/flash.c b/board/siemens/pcu_e/flash.c index b8c0df7743..05c364bb23 100644 --- a/board/siemens/pcu_e/flash.c +++ b/board/siemens/pcu_e/flash.c @@ -148,7 +148,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, PCU_MONITOR_BASE, - PCU_MONITOR_BASE+CFG_MONITOR_LEN-1, + PCU_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); #ifdef CFG_ENV_IS_IN_FLASH diff --git a/board/sixnet/flash.c b/board/sixnet/flash.c index c201875ba0..3bf2ff85db 100644 --- a/board/sixnet/flash.c +++ b/board/sixnet/flash.c @@ -100,7 +100,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); #endif diff --git a/board/smdk2400/flash.c b/board/smdk2400/flash.c index 6882b88451..eb9eaa0deb 100644 --- a/board/smdk2400/flash.c +++ b/board/smdk2400/flash.c @@ -93,7 +93,7 @@ ulong flash_init (void) */ flash_protect ( FLAG_PROTECT_SET, CFG_FLASH_BASE, - CFG_FLASH_BASE + _armboot_end_data - _armboot_start, + CFG_FLASH_BASE + monitor_flash_len - 1, &flash_info[0]); flash_protect ( FLAG_PROTECT_SET, diff --git a/board/smdk2410/flash.c b/board/smdk2410/flash.c index c2ec2354b6..5d04ed43d7 100644 --- a/board/smdk2410/flash.c +++ b/board/smdk2410/flash.c @@ -113,7 +113,7 @@ ulong flash_init(void) flash_protect(FLAG_PROTECT_SET, CFG_FLASH_BASE, - CFG_FLASH_BASE + _armboot_end_data - _armboot_start, + CFG_FLASH_BASE + monitor_flash_len - 1, &flash_info[0]); flash_protect(FLAG_PROTECT_SET, diff --git a/board/svm_sc8xx/flash.c b/board/svm_sc8xx/flash.c index 8c0e229130..b50f77b631 100644 --- a/board/svm_sc8xx/flash.c +++ b/board/svm_sc8xx/flash.c @@ -149,7 +149,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); #endif @@ -176,7 +176,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[1]); #endif diff --git a/board/tqm8260/flash.c b/board/tqm8260/flash.c index dd7a4cc838..056fe810b3 100644 --- a/board/tqm8260/flash.c +++ b/board/tqm8260/flash.c @@ -204,7 +204,7 @@ unsigned long flash_init (void) #if CFG_MONITOR_BASE >= CFG_FLASH0_BASE flash_protect (FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, &flash_info[0]); + CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0]); #endif #if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR) diff --git a/board/tqm8xx/flash.c b/board/tqm8xx/flash.c index 2f74ccccf2..6b4ea7d227 100644 --- a/board/tqm8xx/flash.c +++ b/board/tqm8xx/flash.c @@ -88,7 +88,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); #endif @@ -113,7 +113,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[1]); #endif diff --git a/board/trab/flash.c b/board/trab/flash.c index 1550e175a4..a2a21c6d25 100644 --- a/board/trab/flash.c +++ b/board/trab/flash.c @@ -99,7 +99,7 @@ ulong flash_init (void) */ flash_protect ( FLAG_PROTECT_SET, CFG_FLASH_BASE, - CFG_FLASH_BASE + _armboot_end_data - _armboot_start, + CFG_FLASH_BASE + monitor_flash_len - 1, &flash_info[0]); flash_protect ( FLAG_PROTECT_SET, diff --git a/board/utx8245/flash.c b/board/utx8245/flash.c index 947fbc3aa5..73bb04d98e 100644 --- a/board/utx8245/flash.c +++ b/board/utx8245/flash.c @@ -145,7 +145,7 @@ unsigned long flash_init(void) */ #if CFG_MONITOR_BASE >= CFG_FLASH_BASE flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, &flash_info[0]); + CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0]); #endif #if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR) diff --git a/board/v37/flash.c b/board/v37/flash.c index cb0e676a13..b42f335010 100644 --- a/board/v37/flash.c +++ b/board/v37/flash.c @@ -79,7 +79,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); #endif diff --git a/board/w7o/flash.c b/board/w7o/flash.c index 0048476236..5651e1cfdd 100644 --- a/board/w7o/flash.c +++ b/board/w7o/flash.c @@ -83,7 +83,7 @@ unsigned long flash_init (void) /* Monitor protection ON by default */ (void)flash_protect(FLAG_PROTECT_SET, - base_b0 + size_b0 - CFG_MONITOR_LEN, + base_b0 + size_b0 - monitor_flash_len, base_b0 + size_b0 - 1, &flash_info[0]); diff --git a/board/walnut405/flash.c b/board/walnut405/flash.c index 81f950ba8c..c9c7cbfdc2 100644 --- a/board/walnut405/flash.c +++ b/board/walnut405/flash.c @@ -92,7 +92,7 @@ unsigned long flash_init (void) /* Monitor protection ON by default */ (void)flash_protect(FLAG_PROTECT_SET, FLASH_BASE0_PRELIM, - FLASH_BASE0_PRELIM+CFG_MONITOR_LEN-1, + FLASH_BASE0_PRELIM+monitor_flash_len-1, &flash_info[0]); size_b1 = 0 ; flash_info[0].size = size_b0; @@ -133,7 +133,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ (void)flash_protect(FLAG_PROTECT_SET, - base_b0+size_b0-CFG_MONITOR_LEN, + base_b0+size_b0-monitor_flash_len, base_b0+size_b0-1, &flash_info[0]); @@ -145,12 +145,12 @@ unsigned long flash_init (void) /* monitor protection ON by default */ (void)flash_protect(FLAG_PROTECT_SET, - base_b1+size_b1-CFG_MONITOR_LEN, + base_b1+size_b1-monitor_flash_len, base_b1+size_b1-1, &flash_info[1]); /* monitor protection OFF by default (one is enough) */ (void)flash_protect(FLAG_PROTECT_CLEAR, - base_b0+size_b0-CFG_MONITOR_LEN, + base_b0+size_b0-monitor_flash_len, base_b0+size_b0-1, &flash_info[0]); } else { diff --git a/board/wepep250/flash.c b/board/wepep250/flash.c index 319dddc4b2..5c9d346da0 100644 --- a/board/wepep250/flash.c +++ b/board/wepep250/flash.c @@ -135,7 +135,7 @@ ulong flash_init (void) flash_protect (FLAG_PROTECT_SET, CFG_FLASH_BASE, - CFG_FLASH_BASE + _armboot_end_data - _armboot_start, + CFG_FLASH_BASE + monitor_flash_len - 1, &flash_info[0]); flash_protect (FLAG_PROTECT_SET, diff --git a/board/westel/amx860/flash.c b/board/westel/amx860/flash.c index 28238c1ca0..12a1335b75 100644 --- a/board/westel/amx860/flash.c +++ b/board/westel/amx860/flash.c @@ -130,7 +130,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); #endif @@ -162,7 +162,7 @@ unsigned long flash_init (void) /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, + CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[1]); # endif |