PowerPC: change board specific early pci_init() into generic.

Signed-off-by: Andre Schwarz <andre.schwarz@matrix-vision.de>

diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c
index 907857bb8fcd0b1d8f4e067d60544f7afcab5838..bfdfa86249642f159aecd04710babfe671394887 100644 (file)
--- a/arch/powerpc/lib/board.c
+++ b/arch/powerpc/lib/board.c
@@ -681,11 +681,10 @@ void board_init_r (gd_t *id, ulong dest_addr)
        unlock_ram_in_cache();  /* it's time to unlock D-cache in e500 */
 #endif
 
-#if defined(CONFIG_BAB7xx) || defined(CONFIG_CPC45)
+#if defined(CONFIG_PCI) && defined(CONFIG_SYS_EARLY_PCI_INIT)
        /*
-        * Do PCI configuration on BAB7xx and CPC45 _before_ the flash
-        * gets initialised, because we need the ISA resp. PCI_to_LOCAL bus
-        * bridge there.
+        * Do early PCI configuration _before_ the flash gets initialised,
+        * because PCU ressources are crucial for flash access on some boards.
         */
        pci_init ();
 #endif
@@ -856,7 +855,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
 
        WATCHDOG_RESET ();
 
-#if defined(CONFIG_PCI) && !defined(CONFIG_BAB7xx) && !defined(CONFIG_CPC45)
+#if defined(CONFIG_PCI) && !defined(CONFIG_SYS_EARLY_PCI_INIT)
        /*
         * Do pci configuration
         */

diff --git a/include/configs/BAB7xx.h b/include/configs/BAB7xx.h
index 4d83786767d1e4fee06c6ec707634fe776c06803..555145e1892f42c240324b993e649d03d5e77ec6 100644 (file)
--- a/include/configs/BAB7xx.h
+++ b/include/configs/BAB7xx.h
@@ -269,6 +269,7 @@
  * PCI stuff
  */
 #define CONFIG_PCI                                /* include pci support */
+#define CONFIG_SYS_EARLY_PCI_INIT
 #define CONFIG_PCI_PNP                            /* pci plug-and-play */
 #define CONFIG_PCI_HOST         PCI_HOST_AUTO
 #undef  CONFIG_PCI_SCAN_SHOW

diff --git a/include/configs/CPC45.h b/include/configs/CPC45.h
index 668cfa2ebba295801c33640b043cc1600c3dbcf1..64512637d75eff07d978f4f2ee497845330863b6 100644 (file)
--- a/include/configs/CPC45.h
+++ b/include/configs/CPC45.h
@@ -467,6 +467,7 @@
  *-----------------------------------------------------------------------
  */
 #define CONFIG_PCI                     /* include pci support                  */
+#define CONFIG_SYS_EARLY_PCI_INIT
 #undef CONFIG_PCI_PNP
 #undef CONFIG_PCI_SCAN_SHOW