X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=drivers%2Fpci%2Fpci.c;h=221054593ef221abb9e05e779a9cf18f3b1b5399;hb=8b71e46ceab8b66208107de688cbb4dd25fe38cd;hp=461908941de2ef7f6220a22e9a7ab2e69c082f48;hpb=4edde96111aefac63d6aaca6ba87a90d149e973e;p=u-boot

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 461908941d..221054593e 100644
--- 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+
  */
 
 /*
@@ -175,11 +174,7 @@ pci_dev_t pci_find_devices(struct pci_device_id *ids, int index)
 	int bus;
 
 	for (hose = pci_get_hose_head(); hose; hose = hose->next) {
-#ifdef CONFIG_SYS_SCSI_SCAN_BUS_REVERSE
-		for (bus = hose->last_busno; bus >= hose->first_busno; bus--) {
-#else
 		for (bus = hose->first_busno; bus <= hose->last_busno; bus++) {
-#endif
 			bdf = pci_hose_find_devices(hose, bus, ids, &index);
 			if (bdf != -1)
 				return bdf;
@@ -431,7 +426,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++)
@@ -462,6 +457,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();
 }