浏览代码

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

Signed-off-by: Andre Schwarz <andre.schwarz@matrix-vision.de>
Andre Schwarz 14 年之前
父节点
当前提交
76221a6cfa
共有 3 个文件被更改,包括 6 次插入5 次删除
  1. 4 5
      arch/powerpc/lib/board.c
  2. 1 0
      include/configs/BAB7xx.h
  3. 1 0
      include/configs/CPC45.h

+ 4 - 5
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
 	 */

+ 1 - 0
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

+ 1 - 0
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