]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
Revert "dm: pci: Allow scan bridge child devices before relocation"
authorSimon Glass <sjg@chromium.org>
Tue, 11 Aug 2015 02:54:52 +0000 (20:54 -0600)
committerLothar Waßmann <LW@KARO-electronics.de>
Thu, 10 Sep 2015 08:23:21 +0000 (10:23 +0200)
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>
drivers/pci/pci-uclass.c

index ad65427801f9cc4dd94fdf9a55615b4a165d237d..7d41d56fd488fbb1c11144e90bca9cc5592179e3 100644 (file)
@@ -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)