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

ppc4xx: Enable PCIe support without PCI support on PPC440/460

Browse Source 
By not defining CONFIG_SYS_PCI_MASTER_INIT and CONFIG_SYS_PCI_TARGET_INIT,
PCI support (host and adapter) will not be enabled. But it's still
possible to use the U-Boot PCI infrastructure for the PCIe ports.

This configuration option is needed for a new 460GT board, which uses
PCIe but has PCI disabled.

Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Stefan Roese 2010-05-21 15:06:19 +02:00
parent fe7cca715c
commit db643773fc
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/powerpc/cpu/ppc4xx/4xx_pci.c
View File

@ -476,7 +476,9 @@ void pci_init_board(void)
*-----------------------------------------------------------------------------*/ *-----------------------------------------------------------------------------*/
#if defined(CONFIG_440) #if defined(CONFIG_440)
#if defined(CONFIG_SYS_PCI_MASTER_INIT) || defined(CONFIG_SYS_PCI_TARGET_INIT)
static struct pci_controller ppc440_hose = {0}; static struct pci_controller ppc440_hose = {0};
#endif
/* /*
* This routine is called to determine if a pci scan should be * This routine is called to determine if a pci scan should be
@ -704,6 +706,7 @@ void pci_master_init(struct pci_controller *hose)
__attribute__((weak, alias("__pci_master_init"))); __attribute__((weak, alias("__pci_master_init")));
#endif /* CONFIG_SYS_PCI_MASTER_INIT */ #endif /* CONFIG_SYS_PCI_MASTER_INIT */
#if defined(CONFIG_SYS_PCI_MASTER_INIT) || defined(CONFIG_SYS_PCI_TARGET_INIT)
int pci_440_init (struct pci_controller *hose) int pci_440_init (struct pci_controller *hose)
{ {
int reg_num = 0; int reg_num = 0;
@ -845,12 +848,19 @@ int pci_440_init (struct pci_controller *hose)
} }
return hose->last_busno; return hose->last_busno;
} }
#endif
void pci_init_board(void) void pci_init_board(void)
{ {
int busno; int busno = 0;
/*
* Only init PCI when either master or target functionality
* is selected.
*/
#if defined(CONFIG_SYS_PCI_MASTER_INIT) || defined(CONFIG_SYS_PCI_TARGET_INIT)
busno = pci_440_init (&ppc440_hose); busno = pci_440_init (&ppc440_hose);
#endif
#if (defined(CONFIG_440SPE) || \ #if (defined(CONFIG_440SPE) || \
defined(CONFIG_460EX) || defined(CONFIG_460GT)) && \ defined(CONFIG_460EX) || defined(CONFIG_460GT)) && \
!defined(CONFIG_PCI_DISABLE_PCIE) !defined(CONFIG_PCI_DISABLE_PCIE)