diff options
author | wdenk <wdenk> | 2003-05-30 12:48:29 +0000 |
---|---|---|
committer | wdenk <wdenk> | 2003-05-30 12:48:29 +0000 |
commit | 3b57fe0a70b903f4db66c558bb9828bc58acf06b (patch) | |
tree | b8e415f6a1ff4e519534c8f7154307977e38b8db /board/eric | |
parent | f07771cc288eb86cad8f8a5c1aa593caf2ba26f8 (diff) | |
download | u-boot-imx-3b57fe0a70b903f4db66c558bb9828bc58acf06b.zip u-boot-imx-3b57fe0a70b903f4db66c558bb9828bc58acf06b.tar.gz u-boot-imx-3b57fe0a70b903f4db66c558bb9828bc58acf06b.tar.bz2 |
* 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)
Diffstat (limited to 'board/eric')
-rw-r--r-- | board/eric/flash.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/board/eric/flash.c b/board/eric/flash.c index c3f6e15..5dfb620 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 { |