From 3b57fe0a70b903f4db66c558bb9828bc58acf06b Mon Sep 17 00:00:00 2001
From: wdenk <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/purple/flash.c  | 2 +-
 board/purple/purple.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'board/purple')

diff --git a/board/purple/flash.c b/board/purple/flash.c
index 56d3acd16..34f1b91c4 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 dfd014b53..b1eb78f0e 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
-- 
cgit v1.2.3