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 <[email protected]>
Reviewed-by: Bin Meng <[email protected]>

diff --git a/arch/riscv/lib/fdt_fixup.c b/arch/riscv/lib/fdt_fixup.c
index 160ccca76e02d2b93524d9c3e3cf77d435c17bf3..bd4a3c993a4ca9859a1008bc6345ea236381cbf4 100644 (file)
--- 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;
                }