Fix init problems for 7xx boards

diff --git a/CHANGELOG b/CHANGELOG
index 14fab2d661261a2820bdcb4584b09bc15688377f..3c6aa9c3b84c8eb732ffd13241138af678cea436 100644 (file)
--- 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 a0e5d732ac487181b8192236bbad0b80dd6c9636..89686bff3ea58feb0d4a8fed988bef6ead041517 100644 (file)
--- 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 2530502a8c67fe8f8bb8e73d9191844ba09bc490..55df486bbaded5d9466201062f3a14f10c5f42c9 100644 (file)
--- 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 0ce11b9807c8346696878d26b6489c80bda1cbff..7727c5f6d6eb0034b7d96a75ff1985b657c394e6 100644 (file)
--- 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 */