From: Simon Glass <sjg@chromium.org>
Date: Tue, 11 Aug 2015 02:54:52 +0000 (-0600)
Subject: Revert "dm: pci: Allow scan bridge child devices before relocation"
X-Git-Tag: v2015.10-rc2~10^2~11
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=78689170329931ad81599d545cddc1b63b1bb4dc;p=oweals%2Fu-boot.git

Revert "dm: pci: Allow scan bridge child devices before relocation"

This reverts commit df189d9ba3f8fd1bc67e3c0c3c4ace16cd065ee1.

Unfortunately this commit breaks chromebook_link because it adds lots of PCI devices
before relocation and there is not enough pre-reloc malloc() memory.

Rathar then increase this memory, revert for now until we figure this out.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
---

diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
index ad65427801..7d41d56fd4 100644
--- a/drivers/pci/pci-uclass.c
+++ b/drivers/pci/pci-uclass.c
@@ -717,6 +717,10 @@ static int pci_uclass_post_probe(struct udevice *bus)
 {
 	int ret;
 
+	/* Don't scan buses before relocation */
+	if (!(gd->flags & GD_FLG_RELOC))
+		return 0;
+
 	debug("%s: probing bus %d\n", __func__, bus->seq);
 	ret = pci_bind_bus_devices(bus);
 	if (ret)