Merge branch '2020-05-15-misc-bugfixes'

[oweals/u-boot.git] / drivers / pci / pci.c

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 4b73a0ff9cb273cd3f01d7aeaff1bfc8b537bfca..e8285bf93639e8fed480091898cec553a155654f 100644 (file)
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2001 Sysgo Real-Time Solutions, GmbH <www.elinos.com>
  * Andreas Heppel <aheppel@sysgo.de>
  *
  * (C) Copyright 2002, 2003
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
@@ -16,8 +15,10 @@
  */
 
 #include <common.h>
+#include <init.h>
 
 #include <command.h>
+#include <env.h>
 #include <errno.h>
 #include <asm/processor.h>
 #include <asm/io.h>
@@ -185,11 +186,8 @@ pci_dev_t pci_find_devices(struct pci_device_id *ids, int index)
        return -1;
 }
 
-int pci_hose_config_device(struct pci_controller *hose,
-                          pci_dev_t dev,
-                          unsigned long io,
-                          pci_addr_t mem,
-                          unsigned long command)
+static int pci_hose_config_device(struct pci_controller *hose, pci_dev_t dev,
+                                 ulong io, pci_addr_t mem, ulong command)
 {
        u32 bar_response;
        unsigned int old_command;
@@ -427,7 +425,7 @@ int pci_hose_scan(struct pci_controller *hose)
 
        if (!gd->pcidelay_done) {
                /* wait "pcidelay" ms (if defined)... */
-               s = getenv("pcidelay");
+               s = env_get("pcidelay");
                if (s) {
                        int val = simple_strtoul(s, NULL, 10);
                        for (i = 0; i < val; i++)
@@ -458,6 +456,10 @@ void pci_init(void)
 {
        hose_head = NULL;
 
+       /* allow env to disable pci init/enum */
+       if (env_get("pcidisable") != NULL)
+               return;
+
        /* now call board specific pci_init()... */
        pci_init_board();
 }