From 3b57fe0a70b903f4db66c558bb9828bc58acf06b Mon Sep 17 00:00:00 2001 From: wdenk Date: Fri, 30 May 2003 12:48:29 +0000 Subject: * Get (mostly) rid of CFG_MONITOR_LEN definition; compute real length instead CFG_MONITOR_LEN is now only used to determine _at_compile_ _time_ (!) if the environment is embedded within the U-Boot image, or in a separate flash sector. * Cleanup CFG_DER #defines in config files (wd maintained only) --- board/esd/adciop/flash.c | 6 +++--- board/esd/ar405/flash.c | 6 +++--- board/esd/canbt/flash.c | 2 +- board/esd/cpci405/flash.c | 6 +++--- board/esd/cpci440/strataflash.c | 2 +- board/esd/cpciiser4/flash.c | 2 +- board/esd/dasa_sim/flash.c | 2 +- board/esd/du405/flash.c | 6 +++--- board/esd/ocrtc/flash.c | 6 +++--- board/esd/pci405/flash.c | 2 +- 10 files changed, 20 insertions(+), 20 deletions(-) (limited to 'board/esd') diff --git a/board/esd/adciop/flash.c b/board/esd/adciop/flash.c index 46ae03b..69618de 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 4fa6b27..3a644f9 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 214948f..685850e 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 02de050..e766895 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 6f62866..de57318 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 214948f..685850e 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 2574eac..32cd64c 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 97d8322..14549c0 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 90965ea..c3d8bec 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 f904aff..1707dcf 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]); -- cgit v1.1