leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Andre Schwarz <andre.schwarz@matrix-vision.de>
This commit is contained in:
Andre Schwarz 2010-10-05 11:59:31 +02:00 committed by Wolfgang Denk
parent e64901c01a
commit 76221a6cfa
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/powerpc/lib/board.c
View File

@ -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
include/configs/BAB7xx.h
View File

@ -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
include/configs/CPC45.h
View File

@ -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