diff options
| author | Tom Rini <trini@konsulko.com> | 2021-10-15 15:58:16 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-10-15 18:30:33 -0400 |
| commit | 6a86f1212656d4497b8980048907535f5294fabe (patch) | |
| tree | 0b57b0ce989476384c052e75d8314f1bc6e232d4 /arch/riscv/lib/fdt_fixup.c | |
| parent | 86acfc96642b5de98ab1df90ee57e17453f47079 (diff) | |
| parent | a0ba216ed420a8953f57f777256f310370b95338 (diff) | |
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-tegra
On merge, fixup order of fdtdec_add_reserved_memory parameters in
arch/arm/cpu/armv8/fsl-layerscape/soc.c
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/riscv/lib/fdt_fixup.c')
| -rw-r--r-- | arch/riscv/lib/fdt_fixup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/riscv/lib/fdt_fixup.c b/arch/riscv/lib/fdt_fixup.c index 61cf8935269..36c16e9be2a 100644 --- a/arch/riscv/lib/fdt_fixup.c +++ b/arch/riscv/lib/fdt_fixup.c @@ -75,7 +75,7 @@ int riscv_fdt_copy_resv_mem_node(const void *src, void *dst) pmp_mem.start = addr; pmp_mem.end = addr + size - 1; err = fdtdec_add_reserved_memory(dst, basename, &pmp_mem, - &phandle, false); + NULL, 0, &phandle, 0); if (err < 0 && err != -FDT_ERR_EXISTS) { log_err("failed to add reserved memory: %d\n", err); return err; |