summaryrefslogtreecommitdiff
path: root/lib/fdtdec.c
diff options
context:
space:
mode:
authorSimon Glass <[email protected]>2024-08-07 16:47:22 -0600
committerTom Rini <[email protected]>2024-08-09 16:03:19 -0600
commit9767c668a5332739ed5da434cbd12c70a5454730 (patch)
treeb2cf6425b7117a77a552888d75e7bf00fc99eca6 /lib/fdtdec.c
parent615d84b6ce0cf51363292ca527644d820aa0a813 (diff)
fdt: Don't overwrite bloblist devicetree
When the devicetree comes from a bloblist, it is currently overwritten by the appended one, if present. It should be preserved. Adjust the logic to support this. Fixes: 70fe2385943 ("fdt: Allow the devicetree to come from a bloblist") Signed-off-by: Simon Glass <[email protected]>
Diffstat (limited to 'lib/fdtdec.c')
-rw-r--r--lib/fdtdec.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index 6865f78c70d..5edc8dd2f9f 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -1685,6 +1685,7 @@ int fdtdec_setup(void)
gd->fdt_src = FDTSRC_BLOBLIST;
log_debug("Devicetree is in bloblist at %p\n",
gd->fdt_blob);
+ ret = 0;
} else {
log_debug("No FDT found in bloblist\n");
ret = -ENOENT;