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 /lib_ppc | |
| 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 'lib_ppc')
| -rw-r--r-- | lib_ppc/board.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/lib_ppc/board.c b/lib_ppc/board.c index bba62d820d2..333d2d25c10 100644 --- a/lib_ppc/board.c +++ b/lib_ppc/board.c @@ -93,6 +93,11 @@ extern flash_info_t flash_info[]; #define TOTAL_MALLOC_LEN CFG_MALLOC_LEN #endif +extern ulong __init_end; +extern ulong _end; + +ulong monitor_flash_len; + /* * Begin and End of memory area for malloc(), and current "brk" */ @@ -383,16 +388,7 @@ void board_init_f (ulong bootflag) * - monitor code * - board info struct */ - len = get_endaddr () - CFG_MONITOR_BASE; - - if (len > CFG_MONITOR_LEN) { - printf ("*** U-Boot size %ld > reserved memory (%d)\n", - len, CFG_MONITOR_LEN); - hang (); - } - - if (CFG_MONITOR_LEN > len) - len = CFG_MONITOR_LEN; + len = (ulong)&_end - CFG_MONITOR_BASE; #ifndef CONFIG_VERY_BIG_RAM addr = CFG_SDRAM_BASE + gd->ram_size; @@ -442,10 +438,10 @@ void board_init_f (ulong bootflag) /* * 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); @@ -600,6 +596,8 @@ void board_init_r (gd_t *id, ulong dest_addr) WATCHDOG_RESET (); gd->reloc_off = dest_addr - CFG_MONITOR_BASE; + + monitor_flash_len = (ulong)&__init_end - dest_addr; /* * We have to relocate the command table manually @@ -705,7 +703,7 @@ void board_init_r (gd_t *id, ulong dest_addr) #if defined(CONFIG_PCU_E) || defined(CONFIG_OXC) bd->bi_flashoffset = 0; #elif CFG_MONITOR_BASE == CFG_FLASH_BASE - bd->bi_flashoffset = CFG_MONITOR_LEN; /* reserved area for startup monitor */ + bd->bi_flashoffset = monitor_flash_len; /* reserved area for startup monitor */ #else bd->bi_flashoffset = 0; #endif |