summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-05-12 01:11:21 +0200
committerWolfgang Denk <wd@denx.de>2008-05-12 01:11:21 +0200
commit65dcfa79204f4750b905a173a5365e0b2eb6c2f6 (patch)
tree41771e174bb0b465985ff553b4cbd4d99d3d7c0c
parent5ddd67efa537fa24318a91aaaf10e4baf065f45d (diff)
downloadu-boot-imx-65dcfa79204f4750b905a173a5365e0b2eb6c2f6.zip
u-boot-imx-65dcfa79204f4750b905a173a5365e0b2eb6c2f6.tar.gz
u-boot-imx-65dcfa79204f4750b905a173a5365e0b2eb6c2f6.tar.bz2
Revert "pci: Add CONFIG_PCI_SKIP_HOST_BRIDGE config option"
This reverts commit 55774b512fdf63c0516d441cc5da7c54bbffb7f2 which broke many PowerPC boards.
-rw-r--r--drivers/pci/pci.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index f01a75e..b820d5e 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -425,9 +425,6 @@ int pci_hose_scan_bus(struct pci_controller *hose, int bus)
dev < PCI_BDF(bus,PCI_MAX_PCI_DEVICES-1,PCI_MAX_PCI_FUNCTIONS-1);
dev += PCI_BDF(0,0,1))
{
-
- /* Bus 0 is not necessarily PCI bridge. */
-#if defined(CONFIG_PCI_SKIP_HOST_BRIDGE)
/* Skip our host bridge */
if ( dev == PCI_BDF(hose->first_busno,0,0) ) {
#if defined(CONFIG_PCI_CONFIG_HOST_BRIDGE) /* don't skip host bridge */
@@ -437,11 +434,10 @@ int pci_hose_scan_bus(struct pci_controller *hose, int bus)
if (getenv("pciconfighost") == NULL) {
continue; /* Skip our host bridge */
}
-#else /* CONFIG_PCI_CONFIG_HOST_BRIDGE */
+#else
continue; /* Skip our host bridge */
-#endif /* CONFIG_PCI_CONFIG_HOST_BRIDGE */
+#endif
}
-#endif /* CONFIG_PCI_SKIP_HOST_BRIDGE */
if (PCI_FUNC(dev) && !found_multi)
continue;
@@ -477,11 +473,8 @@ int pci_hose_scan_bus(struct pci_controller *hose, int bus)
hose->fixup_irq(hose, dev);
#ifdef CONFIG_PCI_SCAN_SHOW
-#if defined(CONFIG_PCI_SKIP_HOST_BRIDGE)
/* Skip our host bridge */
- if ( dev != PCI_BDF(hose->first_busno,0,0) )
-#endif
- {
+ if ( dev != PCI_BDF(hose->first_busno,0,0) ) {
unsigned char int_line;
pci_hose_read_config_byte(hose, dev, PCI_INTERRUPT_LINE,