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)
---
 lib_mips/board.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'lib_mips')

diff --git a/lib_mips/board.c b/lib_mips/board.c
index 4bab3c5855..2bbf029d2e 100644
--- a/lib_mips/board.c
+++ b/lib_mips/board.c
@@ -42,6 +42,11 @@
 
 extern int timer_init(void);
 
+extern ulong uboot_end_data;
+extern ulong uboot_end;
+
+ulong monitor_flash_len;
+
 const char version_string[] =
 	U_BOOT_VERSION" (" __DATE__ " - " __TIME__ ")";
 
@@ -176,7 +181,7 @@ void board_init_f(ulong bootflag)
 	gd_t gd_data, *id;
 	bd_t *bd;
 	init_fnc_t **init_fnc_ptr;
-	ulong addr, addr_sp, len   = CFG_MONITOR_LEN;
+	ulong addr, addr_sp, len = (ulong)&uboot_end - CFG_MONITOR_BASE;
 #ifdef CONFIG_PURPLE
 	void copy_code (ulong);
 #endif
@@ -209,10 +214,10 @@ void board_init_f(ulong bootflag)
 #endif
 	 
 		/* Reserve memory for U-Boot code, data & bss
-		 * round down to next 4 kB limit
+		 * round down to next 16 kB limit
 		 */
 	addr -= len;
-	addr &= ~(4096 - 1);
+	addr &= ~(16 * 1024 - 1);
 
 #ifdef DEBUG
 	printf ("Reserving %ldk for U-Boot at: %08lx\n", len >> 10, addr);
@@ -319,6 +324,8 @@ void board_init_r (gd_t *id, ulong dest_addr)
 
 	gd->reloc_off = dest_addr - CFG_MONITOR_BASE;
 
+	monitor_flash_len = (ulong)&uboot_end_data - dest_addr;
+
 	/*
 	 * We have to relocate the command table manually
 	 */
@@ -360,7 +367,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
 	bd->bi_flashstart = CFG_FLASH_BASE;
 	bd->bi_flashsize = size;
 #if CFG_MONITOR_BASE == CFG_FLASH_BASE
-	bd->bi_flashoffset = CFG_MONITOR_LEN;	/* reserved area for U-Boot */
+	bd->bi_flashoffset = monitor_flash_len;	/* reserved area for U-Boot */
 #else
 	bd->bi_flashoffset = 0;
 #endif
-- 
cgit v1.2.1