Skip to contentSkip to conversation

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

PATCH New Andre Schwarz 2 participants 4 messages Oct 5, 2010 – Oct 6, 2010 PowerPC

lore
Share & tools
lore
#0 lore raw

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

---
 arch/powerpc/lib/board.c |    9 ++++-----
 include/configs/BAB7xx.h |    1 +
 include/configs/CPC45.h  |    1 +
 3 files changed, 6 insertions(+), 5 deletions(-)
arch/powerpc/lib/board.c +4 -5
index 8f6a7c9..7870f26 100644
@@ -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
 	 */
include/configs/BAB7xx.h +1 -0
index 4d83786..555145e 100644
@@ -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
include/configs/CPC45.h +1 -0
index 668cfa2..6451263 100644
@@ -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
 
Signature · 6 lines
1.7.0.4


MATRIX VISION GmbH, Talstrasse 16, DE-71570 Oppenweiler
Registergericht: Amtsgericht Stuttgart, HRB 271090
Geschaeftsfuehrer: Gerhard Thullner, Werner Armingeon, Uwe Furtner
#1 lore raw

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

Dear Andre Schwarz,

arch/powerpc/lib/board.c void board_init_r (gd_t *id, ulong dest_addr) · line 687

Quoted 3 lines · In message <[email protected]>…
arch/powerpc/lib/board.c +2 -0
+	 * Do early PCI configuration _before_ the flash gets initialised,
+	 * because PCU ressources are crucial for flash access on some boards.

PCU? Or PCI?

[No need to resend, I can fix this when applying; please just confirm that this is only a typo and not something I don't understand]

Best regards,

Wolfgang Denk

Signature · 4 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
The Gates in my computer are AND, OR and NOT; they are not Bill.
#2 lore raw

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

Wolfgang,

Quoted 6 lines

arch/powerpc/lib/board.c void board_init_r (gd_t *id, ulong dest_addr) · line 687

Quoted 3 lines · In message <[email protected]>…
arch/powerpc/lib/board.c +2 -0
+	 * Do early PCI configuration _before_ the flash gets initialised,
+	 * because PCU ressources are crucial for flash access on some boards.

PCU? Or PCI?

PCI.

Quoted 3 lines

[No need to resend, I can fix this when applying; please just confirm that this is only a typo and not something I don't understand]

thank you.

Regards,
Andr? Schwarz

MATRIX VISION GmbH, Talstrasse 16, DE-71570 Oppenweiler
Registergericht: Amtsgericht Stuttgart, HRB 271090
Geschaeftsfuehrer: Gerhard Thullner, Werner Armingeon, Uwe Furtner

#3 lore raw

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

In reply to Andre Schwarz

Dear Andre Schwarz,

Quoted 7 lines · In message <[email protected]>…
---
 arch/powerpc/lib/board.c |    9 ++++-----
 include/configs/BAB7xx.h |    1 +
 include/configs/CPC45.h  |    1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Beware of the Turing Tar-pit in  which  everything  is  possible  but
nothing of interest is easy.