Signed-off-by: Andre Schwarz andre.schwarz@matrix-vision.de --- arch/powerpc/lib/board.c | 9 ++++----- include/configs/BAB7xx.h | 1 + include/configs/CPC45.h | 1 + 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c index 8f6a7c9..7870f26 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 */ diff --git a/include/configs/BAB7xx.h b/include/configs/BAB7xx.h index 4d83786..555145e 100644 --- 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 668cfa2..6451263 100644 --- 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