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 <s...@chromium.org>
---

(no changes since v1)

 lib/fdtdec.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index b2c59ab3818..4861da1fab1 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -1678,6 +1678,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;
-- 
2.34.1

Reply via email to