diff options
| author | Simon Glass <sjg@chromium.org> | 2015-08-10 20:54:52 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-08-14 09:50:11 -0600 |
| commit | 78689170329931ad81599d545cddc1b63b1bb4dc (patch) | |
| tree | a999744c2c597b36a41f3f74d12284f0246571a2 /drivers | |
| parent | f0c7d9c74642ccd6c76993b721b0fb87aab685fa (diff) | |
| download | talos-obmc-uboot-78689170329931ad81599d545cddc1b63b1bb4dc.tar.gz talos-obmc-uboot-78689170329931ad81599d545cddc1b63b1bb4dc.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pci/pci-uclass.c | 4 |
1 files changed, 4 insertions, 0 deletions
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) |
