diff options
| author | Tom Rini <[email protected]> | 2025-04-28 10:13:42 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-04-28 12:45:45 -0600 |
| commit | b2b2a21b8708bddea3f27e6dab59eadcd04c6fab (patch) | |
| tree | ba3c513110258dd28e5b10ea9e8e72b306a19fb8 /lib | |
| parent | d2eef3a4a715a579d4a026e3be20aa1098d50a9f (diff) | |
| parent | bd5dde0346c3e57634c98cc7a8150606d92d8d38 (diff) | |
Merge patch series "bloblist: fix the overriding of fdt from bloblist"
This series from Raymond Mao <[email protected]> fixes some cases
of passing the device tree to U-Boot via standard passage and then
ensures that we set the environment variable of the device tree
correctly in this case.
Link: https://lore.kernel.org/r/[email protected]
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/fdtdec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/fdtdec.c b/lib/fdtdec.c index f09c9926a7a..c38738b48c7 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -1708,7 +1708,7 @@ int fdtdec_setup(void) gd->fdt_src = FDTSRC_BLOBLIST; log_debug("Devicetree is in bloblist at %p\n", gd->fdt_blob); - ret = 0; + goto setup_fdt; } else { log_debug("No FDT found in bloblist\n"); ret = -ENOENT; @@ -1752,6 +1752,7 @@ int fdtdec_setup(void) } } +setup_fdt: if (CONFIG_IS_ENABLED(MULTI_DTB_FIT)) setup_multi_dtb_fit(); |