diff options
| author | Tom Rini <trini@konsulko.com> | 2019-07-24 23:24:50 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-07-24 23:24:50 +0300 |
| commit | f9b65c76b4828efbf8093c6b02bee5af0045b98b (patch) | |
| tree | 1429cb8e3cdfea42b63778ddf06ad0b33fb7bcf0 /common | |
| parent | a9aa4c5700c68c070d63a391b51ea8d341b6e8a6 (diff) | |
| parent | 44e02e39a91cd91aae5a28d90259d3a6996010bf (diff) | |
| download | u-boot-f9b65c76b4828efbf8093c6b02bee5af0045b98b.tar.xz | |
Merge tag 'dm-pull-24jul19-take3' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm
Minor driver-model fixes and tweaks
A few device-tree fixes
Binman support for extracting files from an image
Diffstat (limited to 'common')
| -rw-r--r-- | common/fdt_support.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/common/fdt_support.c b/common/fdt_support.c index a23367b54a..86de5b8f05 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -671,30 +671,33 @@ int fdt_pci_dma_ranges(void *blob, int phb_off, struct pci_controller *hose) { dma_range[0] = 0; if (size >= 0x100000000ull) - dma_range[0] |= FDT_PCI_MEM64; + dma_range[0] |= cpu_to_fdt32(FDT_PCI_MEM64); else - dma_range[0] |= FDT_PCI_MEM32; + dma_range[0] |= cpu_to_fdt32(FDT_PCI_MEM32); if (hose->regions[r].flags & PCI_REGION_PREFETCH) - dma_range[0] |= FDT_PCI_PREFETCH; + dma_range[0] |= cpu_to_fdt32(FDT_PCI_PREFETCH); #ifdef CONFIG_SYS_PCI_64BIT - dma_range[1] = bus_start >> 32; + dma_range[1] = cpu_to_fdt32(bus_start >> 32); #else dma_range[1] = 0; #endif - dma_range[2] = bus_start & 0xffffffff; + dma_range[2] = cpu_to_fdt32(bus_start & 0xffffffff); if (addrcell == 2) { - dma_range[3] = phys_start >> 32; - dma_range[4] = phys_start & 0xffffffff; + dma_range[3] = cpu_to_fdt32(phys_start >> 32); + dma_range[4] = cpu_to_fdt32(phys_start & 0xffffffff); } else { - dma_range[3] = phys_start & 0xffffffff; + dma_range[3] = cpu_to_fdt32(phys_start & 0xffffffff); } if (sizecell == 2) { - dma_range[3 + addrcell + 0] = size >> 32; - dma_range[3 + addrcell + 1] = size & 0xffffffff; + dma_range[3 + addrcell + 0] = + cpu_to_fdt32(size >> 32); + dma_range[3 + addrcell + 1] = + cpu_to_fdt32(size & 0xffffffff); } else { - dma_range[3 + addrcell + 0] = size & 0xffffffff; + dma_range[3 + addrcell + 0] = + cpu_to_fdt32(size & 0xffffffff); } dma_range += (3 + addrcell + sizecell); @@ -1552,7 +1555,7 @@ u64 fdt_get_base_address(const void *fdt, int node) prop = fdt_getprop(fdt, node, "reg", &size); - return prop ? fdt_translate_address(fdt, node, prop) : 0; + return prop ? fdt_translate_address(fdt, node, prop) : OF_BAD_ADDR; } /* |