From: wdenk <wdenk>
Date: Wed, 23 Oct 2002 23:37:04 +0000 (+0000)
Subject: Fix init problems for 7xx boards
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e8f3f67299ea26e4c5de39e58cf383e4591ac572;p=users%2Frw%2Fppcboot.git

Fix init problems for 7xx boards
---

diff --git a/CHANGELOG b/CHANGELOG
index 14fab2d..3c6aa9c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@
 Modifications since 1.2.0:
 ======================================================================
 
+* Fix init problems for 7xx boards
+
 * Fix endianess problems in autoscript command
 
 * Add VFD support for TRAB
diff --git a/board/eltec/bab7xx/bab7xx.c b/board/eltec/bab7xx/bab7xx.c
index a0e5d73..89686bf 100644
--- a/board/eltec/bab7xx/bab7xx.c
+++ b/board/eltec/bab7xx/bab7xx.c
@@ -166,9 +166,10 @@ long int initdram(int board_type)
 
 /* ------------------------------------------------------------------------- */
 
-void after_reloc (gd_t *gd, ulong dest_addr)
+void after_reloc (ulong dest_addr)
 {
-    /* DECLARE_GLOBAL_DATA_PTR; r3, r4 from start.S ? */
+    DECLARE_GLOBAL_DATA_PTR;
+
     /*
      * Jump to the main ppcboot board init code
      */
diff --git a/board/eltec/elppc/elppc.c b/board/eltec/elppc/elppc.c
index 2530502..55df486 100644
--- a/board/eltec/elppc/elppc.c
+++ b/board/eltec/elppc/elppc.c
@@ -135,9 +135,10 @@ void watchdog_reset(void)
 
 /* ------------------------------------------------------------------------- */
 
-void after_reloc (gd_t *gd, ulong dest_addr)
+void after_reloc (ulong dest_addr)
 {
-    /* DECLARE_GLOBAL_DATA_PTR; r3, r4 from start.S ? */
+    DECLARE_GLOBAL_DATA_PTR;
+
     /*
      * Jump to the main ppcboot board init code
      */
diff --git a/cpu/74xx_7xx/start.S b/cpu/74xx_7xx/start.S
index 0ce11b9..7727c5f 100644
--- a/cpu/74xx_7xx/start.S
+++ b/cpu/74xx_7xx/start.S
@@ -715,8 +715,7 @@ in_ram:
 	cmplw	0, r3, r4
 	bne	5b
 6:
-	mr	r3, r9		/* Global Data pointer		*/
-	mr	r4, r10		/* Destination Address		*/
+	mr	r3, r10		/* Destination Address		*/
 	bl	after_reloc
 
 	/* not reached - end relocate_code */