Skip to contentSkip to conversation

lib_ppc: Revert "Make MPC83xx one step closer to full relocation."

PATCH New Kim Phillips 2 participants 2 messages Apr 21, 2008 – Apr 25, 2008

lore
Share & tools
lore

Kim Phillips

author
#0 lore raw

PATCH 1/1 lib_ppc: Revert "Make MPC83xx one step closer to full relocation."

This reverts commit 70431e8a7393b6b793f77957f95b999fc9a269b8 which has proven problematic getting right from the start at least on 83xx and 4xx.

Signed-off-by Kim Phillips <[email protected]>
---
 cpu/mpc83xx/start.S |   11 ++++-------
 lib_ppc/board.c     |    1 -
 2 files changed, 4 insertions(+), 8 deletions(-)
cpu/mpc83xx/start.S +4 -7
index fdf9d35..309eb30 100644
@@ -172,11 +172,8 @@ boot_warm: /* time t 5 */
 	/* there and deflate the flash size back to minimal size      */
 	/*------------------------------------------------------------*/
 	bl map_flash_by_law1
-
-	GET_GOT			/* initialize GOT access	*/
-	lwz r4, GOT(_start)
-	addi r4, r4, -EXC_OFF_SYS_RESET
-
+	lis r4, (CFG_MONITOR_BASE)@h
+	ori r4, r4, (CFG_MONITOR_BASE)@l
 	addi r5, r4, in_flash - _start + EXC_OFF_SYS_RESET
 	mtlr r5
 	blr

@@ -875,8 +872,8 @@ relocate_code:
 	mr	r10, r5		/* Save copy of Destination Address */
 
 	mr	r3,  r5				/* Destination Address */
-	lwz	r4, GOT(_start)
-	addi	r4, r4, -EXC_OFF_SYS_RESET
+	lis	r4, CFG_MONITOR_BASE at h		/* Source      Address */
+	ori	r4, r4, CFG_MONITOR_BASE at l
 	lwz	r5, GOT(__init_end)
 	sub	r5, r5, r4
 	li	r6, CFG_CACHELINE_SIZE		/* Cache Line Size */
lib_ppc/board.c +0 -1
index b2bc4eb..1b8a872 100644
@@ -124,7 +124,6 @@ DECLARE_GLOBAL_DATA_PTR;
 #define CFG_MEM_TOP_HIDE	0
 #endif
 
-extern ulong _start;
 extern ulong __init_end;
 extern ulong _end;
 ulong monitor_flash_len;
Signature · 1 line
1.5.5
Applied
#1 lore raw

PATCH 1/1 lib_ppc: Revert "Make MPC83xx one step closer to full relocation."

Quoted 9 lines · In message <[email protected]> you wrote:

This reverts commit 70431e8a7393b6b793f77957f95b999fc9a269b8 which has proven problematic getting right from the start at least on 83xx and 4xx.

Signed-off-by Kim Phillips <[email protected]>
---
 cpu/mpc83xx/start.S |   11 ++++-------
 lib_ppc/board.c     |    1 -
 2 files changed, 4 insertions(+), 8 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 4 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Bus error -- driver executed.