summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstroese <stroese>2004-12-16 17:48:41 +0000
committerstroese <stroese>2004-12-16 17:48:41 +0000
commit6bb992ba9d612370c076ab80ba29ac12f97da125 (patch)
treec8a42638243c3220e7fa8f6de6643c12e62471e9
parenta842a6d23c75d77effa9e444e4df47c86a03d06c (diff)
downloadu-boot-imx-6bb992ba9d612370c076ab80ba29ac12f97da125.zip
u-boot-imx-6bb992ba9d612370c076ab80ba29ac12f97da125.tar.gz
u-boot-imx-6bb992ba9d612370c076ab80ba29ac12f97da125.tar.bz2
added CONFIG_PCI_CONFIG_HOST_BRIDGE to enable host bridge configuration
-rw-r--r--drivers/pci.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/drivers/pci.c b/drivers/pci.c
index b9dcc5b..c477a89 100644
--- a/drivers/pci.c
+++ b/drivers/pci.c
@@ -429,8 +429,18 @@ int pci_hose_scan_bus(struct pci_controller *hose, int bus)
dev += PCI_BDF(0,0,1))
{
/* Skip our host bridge */
- if ( dev == PCI_BDF(hose->first_busno,0,0) )
- continue;
+ if ( dev == PCI_BDF(hose->first_busno,0,0) ) {
+#if defined(CONFIG_PCI_CONFIG_HOST_BRIDGE) /* don't skip host bridge */
+ /*
+ * Only skip hostbridge configuration if "pciconfighost" is not set
+ */
+ if (getenv("pciconfighost") == NULL) {
+ continue; /* Skip our host bridge */
+ }
+#else
+ continue; /* Skip our host bridge */
+#endif
+ }
if (PCI_FUNC(dev) && !found_multi)
continue;