diff options
| author | Atish Patra <atish.patra@wdc.com> | 2020-06-24 14:56:14 -0700 |
|---|---|---|
| committer | Andes <uboot@andestech.com> | 2020-07-03 15:09:00 +0800 |
| commit | 7eb4bcc3f49c4eb7b494766163a78909f2c1f379 (patch) | |
| tree | fef74f0d18ae1220d57ece5c3407fcc44e14e731 | |
| parent | ba51269f75e99024b8e3c904b0964f3dcb3cd629 (diff) | |
riscv: Do not return error if reserved node already exists
Not all errors are fatal. If a reserved memory node already exists in the
destination device tree, we can continue to boot without failing.
Signed-off-by: Atish Patra <atish.patra@wdc.com>
Reviewed-by: Bin Meng <bin.meng@windriver.com>
| -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 160ccca76e..bd4a3c993a 100644 --- a/arch/riscv/lib/fdt_fixup.c +++ b/arch/riscv/lib/fdt_fixup.c @@ -74,7 +74,7 @@ int riscv_fdt_copy_resv_mem_node(const void *src, void *dst) pmp_mem.end = addr + size - 1; err = fdtdec_add_reserved_memory(dst, basename, &pmp_mem, &phandle); - if (err < 0) { + if (err < 0 && err != -FDT_ERR_EXISTS) { printf("failed to add reserved memory: %d\n", err); return err; } |