diff options
| author | Tom Rini <trini@konsulko.com> | 2021-07-15 07:11:06 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-07-15 07:11:06 -0400 |
| commit | 18e7ebf7555203e26066c6264b2275c34e03632d (patch) | |
| tree | 6ea4a683e3c89b33c3d0c2568a544856641b601b /arch | |
| parent | c11f5abce84f630c92304683d5bde3204c5612c4 (diff) | |
| parent | a4c577f981569bf34e997cd85618f922409d6b2f (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-marvell
- Turris_omnia/mox: SPI NOR and MTD related changes / fixes (Marek)
- a37xx: pci: Misc fixes / optimizations (Pali)
- Espressobin: Fix setting $fdtfile env & changes in MMC detection
(Pali)
- MMC: mmc_get_op_cond: Allow quiet detection of eMMC (Pali)
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-mvebu/armada3700/cpu.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-mvebu/armada3700/cpu.c b/arch/arm/mach-mvebu/armada3700/cpu.c index 9aec0ce9a4..7702028ba1 100644 --- a/arch/arm/mach-mvebu/armada3700/cpu.c +++ b/arch/arm/mach-mvebu/armada3700/cpu.c @@ -331,6 +331,10 @@ int a3700_fdt_fix_pcie_regions(void *blob) /* Calculate fixup offset from first child address (in last cell) */ fix_offset = base - fdt32_to_cpu(ranges[2]); + /* If fixup offset is zero then there is nothing to fix */ + if (!fix_offset) + return 0; + /* * Fix address (last cell) of each child address and each parent * address |