* Patch by Mark Jonas, 08 June 2004:

[oweals/u-boot.git] / cpu / 74xx_7xx / start.S

diff --git a/cpu/74xx_7xx/start.S b/cpu/74xx_7xx/start.S
index 7d7a493fea6a5427c39b6212bf8bf18f73d1d949..534c818104d63e1da1d8d894fad04ec4d5281ac0 100644 (file)
--- a/cpu/74xx_7xx/start.S
+++ b/cpu/74xx_7xx/start.S
@@ -42,7 +42,10 @@
 #include <asm/cache.h>
 #include <asm/mmu.h>
 
+#if !defined(CONFIG_DB64360) && \
+    !defined(CONFIG_DB64460)
 #include <galileo/gt64260R.h>
+#endif
 
 #ifndef  CONFIG_IDENT_STRING
 #define  CONFIG_IDENT_STRING ""
@@ -264,7 +267,7 @@ in_flash:
         * everything is write-through.
         * The init-mem BAT can be reused after reloc. The old
         * gt-regs BAT can be reused after board_init_f calls
-        * board_pre_init (EVB only).
+        * board_early_init_f (EVB only).
         */
 #if !defined(CONFIG_BAB7xx) && !defined(CONFIG_ELPPC)
        /* enable address translation */
@@ -749,7 +752,9 @@ in_ram:
        bne     5b
 6:
        mr      r3, r10         /* Destination Address          */
-#ifdef CONFIG_AMIGAONEG3SE
+#if defined(CONFIG_AMIGAONEG3SE) || \
+    defined(CONFIG_DB64360)     || \
+    defined(CONFIG_DB64460)
        mr      r4, r9          /* Use RAM copy of the global data */
 #endif
        bl      after_reloc