|
@@ -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 */
|
|
unlock_ram_in_cache(); /* it's time to unlock D-cache in e500 */
|
|
#endif
|
|
#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 ();
|
|
pci_init ();
|
|
#endif
|
|
#endif
|
|
@@ -856,7 +855,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
|
|
|
|
|
|
WATCHDOG_RESET ();
|
|
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
|
|
* Do pci configuration
|
|
*/
|
|
*/
|