diff options
| author | Tom Rini <trini@konsulko.com> | 2016-07-28 12:45:00 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-07-28 12:45:00 (GMT) |
| commit | 4711e7f7af839b41a6d78490257a9e7975494dd3 (patch) | |
| tree | 7fb01e8da7cee537ebd1a070c750da7c4cc43482 /drivers/pci | |
| parent | fe34b6a4845476208ca7d19a35179e56bebf3877 (diff) | |
| parent | 77cbd3a14184c61d55d7fcddd88fa4e96efc9901 (diff) | |
| download | u-boot-fsl-qoriq-4711e7f7af839b41a6d78490257a9e7975494dd3.tar.xz | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/pci.c | 4 | ||||
| -rw-r--r-- | drivers/pci/pcie_imx.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 4b73a0f..6b36c18 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -458,6 +458,10 @@ void pci_init(void) { hose_head = NULL; + /* allow env to disable pci init/enum */ + if (getenv("pcidisable") != NULL) + return; + /* now call board specific pci_init()... */ pci_init_board(); } diff --git a/drivers/pci/pcie_imx.c b/drivers/pci/pcie_imx.c index c14bb0a..732d59d 100644 --- a/drivers/pci/pcie_imx.c +++ b/drivers/pci/pcie_imx.c @@ -595,7 +595,7 @@ static int imx_pcie_link_up(void) while (!imx6_pcie_link_up()) { udelay(10); count++; - if (count >= 2000) { + if (count >= 4000) { #ifdef CONFIG_PCI_SCAN_SHOW puts("PCI: pcie phy link never came up\n"); #endif |