[PATCH] Avoid assigning PCI resources from zero address

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

diff --git a/cpu/74xx_7xx/start.S b/cpu/74xx_7xx/start.S
index e8854f02077a8ae40f73c281424cf5493aa5d5fb..11430388f50213a35581a3a039d01e35a81c6a79 100644 (file)
--- a/cpu/74xx_7xx/start.S
+++ b/cpu/74xx_7xx/start.S
@@ -43,7 +43,9 @@
 #include <asm/mmu.h>
 
 #if !defined(CONFIG_DB64360) && \
-    !defined(CONFIG_DB64460)
+    !defined(CONFIG_DB64460) && \
+    !defined(CONFIG_CPCI750) && \
+    !defined(CONFIG_P3Mx)
 #include <galileo/gt64260R.h>
 #endif
 
@@ -267,9 +269,9 @@ 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)
+#if !defined(CONFIG_BAB7xx) && !defined(CONFIG_ELPPC) && !defined(CONFIG_P3Mx)
        /* enable address translation */
        bl      enable_addr_trans
        sync
@@ -754,7 +756,10 @@ in_ram:
        mr      r3, r10         /* Destination Address          */
 #if defined(CONFIG_AMIGAONEG3SE) || \
     defined(CONFIG_DB64360)     || \
-    defined(CONFIG_DB64460)
+    defined(CONFIG_DB64460)      || \
+    defined(CONFIG_CPCI750)    || \
+    defined(CONFIG_PPMC7XX)     || \
+    defined(CONFIG_P3Mx)
        mr      r4, r9          /* Use RAM copy of the global data */
 #endif
        bl      after_reloc