diff options
| author | Tom Rini <trini@konsulko.com> | 2018-03-30 18:17:23 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-03-30 18:17:23 -0400 |
| commit | 80a66a55fa46960e0c8c527503e76adc18bfe904 (patch) | |
| tree | 318e064a0759986e8d941f32b1f99194eb4ecd78 /drivers/pci/pci-uclass.c | |
| parent | 0ca0a546b186478b9de80cbd27fa8baf17e30863 (diff) | |
| parent | 5d73292cf84db1e8f7d99dd27100ef2e8ac15c4e (diff) | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'drivers/pci/pci-uclass.c')
| -rw-r--r-- | drivers/pci/pci-uclass.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c index ad43e8a27cc..a2e829608a3 100644 --- a/drivers/pci/pci-uclass.c +++ b/drivers/pci/pci-uclass.c @@ -876,6 +876,9 @@ static int decode_regions(struct pci_controller *hose, ofnode parent_node, #ifdef CONFIG_NR_DRAM_BANKS bd_t *bd = gd->bd; + if (!bd) + return 0; + for (i = 0; i < CONFIG_NR_DRAM_BANKS; ++i) { if (bd->bi_dram[i].size) { pci_set_region(hose->regions + hose->region_count++, @@ -894,8 +897,9 @@ static int decode_regions(struct pci_controller *hose, ofnode parent_node, #endif if (gd->pci_ram_top && gd->pci_ram_top < base + size) size = gd->pci_ram_top - base; - pci_set_region(hose->regions + hose->region_count++, base, base, - size, PCI_REGION_MEM | PCI_REGION_SYS_MEMORY); + if (size) + pci_set_region(hose->regions + hose->region_count++, base, + base, size, PCI_REGION_MEM | PCI_REGION_SYS_MEMORY); #endif return 0; |