aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc
diff options
context:
space:
mode:
authorAndre Schwarz <andre.schwarz@matrix-vision.de>2010-10-05 11:59:31 +0200
committerWolfgang Denk <wd@denx.de>2010-10-06 22:37:35 +0200
commit76221a6cfaac9ff2680bfddde6d7d271ff70d7a0 (patch)
treeeacde3e970f139fcf2f0907d03f25fd87cf9006f /arch/powerpc
parente64901c01a891963c00eafd64c5891b1286240a3 (diff)
downloadu-boot-linaro-stable-76221a6cfaac9ff2680bfddde6d7d271ff70d7a0.tar.gz
PowerPC: change board specific early pci_init() into generic.
Signed-off-by: Andre Schwarz <andre.schwarz@matrix-vision.de>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/lib/board.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c
index 907857bb8..bfdfa8624 100644
--- 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
*/