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 /cpu/74xx_7xx | |
| 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 'cpu/74xx_7xx')
| -rw-r--r-- | cpu/74xx_7xx/start.S | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/cpu/74xx_7xx/start.S b/cpu/74xx_7xx/start.S index 96559c2..4a0e7a1 100644 --- a/cpu/74xx_7xx/start.S +++ b/cpu/74xx_7xx/start.S @@ -68,6 +68,7 @@ GOT_ENTRY(_end_of_vectors) GOT_ENTRY(transfer_to_handler) + GOT_ENTRY(__init_end) GOT_ENTRY(_end) GOT_ENTRY(__bss_start) END_GOT @@ -590,8 +591,8 @@ relocate_code: mr r3, r5 /* Destination Address */ lis r4, CFG_MONITOR_BASE@h /* Source Address */ ori r4, r4, CFG_MONITOR_BASE@l - lis r5, CFG_MONITOR_LEN@h /* Length in Bytes */ - ori r5, r5, CFG_MONITOR_LEN@l + lwz r5, GOT(__init_end) + sub r5, r5, r4 li r6, CFG_CACHELINE_SIZE /* Cache Line Size */ /* @@ -617,8 +618,8 @@ relocate_code: mr r3, r10 /* Destination Address */ lis r4, CFG_MONITOR_BASE@h /* Source Address */ ori r4, r4, CFG_MONITOR_BASE@l - lis r5, CFG_MONITOR_LEN@h /* Length in Bytes */ - ori r5, r5, CFG_MONITOR_LEN@l + lwz r5, GOT(__init_end) + sub r5, r5, r4 li r6, CFG_CACHELINE_SIZE /* Cache Line Size */ #else cmplw cr1,r3,r4 @@ -738,12 +739,6 @@ in_ram: /* not reached - end relocate_code */ /*-----------------------------------------------------------------------*/ - /* Problems accessing "end" in C, so do it here */ - .globl get_endaddr -get_endaddr: - lwz r3,GOT(_end) - blr - /* * Copy exception vector code to low memory * |