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/purple | |
| parent | f07771cc288eb86cad8f8a5c1aa593caf2ba26f8 (diff) | |
* Get (mostly) rid of CFG_MONITOR_LEN definition; compute real lengthLABEL_2003_05_30_1450
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/purple')
| -rw-r--r-- | board/purple/flash.c | 2 | ||||
| -rw-r--r-- | board/purple/purple.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/board/purple/flash.c b/board/purple/flash.c index 56d3acd160e..34f1b91c400 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 dfd014b53b5..b1eb78f0e60 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 |