diff options
| author | Tom Rini <trini@konsulko.com> | 2025-04-28 10:13:42 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-04-28 12:45:45 -0600 |
| commit | b2b2a21b8708bddea3f27e6dab59eadcd04c6fab (patch) | |
| tree | ba3c513110258dd28e5b10ea9e8e72b306a19fb8 | |
| parent | d2eef3a4a715a579d4a026e3be20aa1098d50a9f (diff) | |
| parent | bd5dde0346c3e57634c98cc7a8150606d92d8d38 (diff) | |
Merge patch series "bloblist: fix the overriding of fdt from bloblist"
This series from Raymond Mao <raymond.mao@linaro.org> 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/20250331224011.2734284-1-raymond.mao@linaro.org
| -rw-r--r-- | env/common.c | 21 | ||||
| -rw-r--r-- | lib/fdtdec.c | 3 |
2 files changed, 22 insertions, 2 deletions
diff --git a/env/common.c b/env/common.c index a58955a4f42..86122582bc1 100644 --- a/env/common.c +++ b/env/common.c @@ -16,6 +16,7 @@ #include <asm/global_data.h> #include <linux/printk.h> #include <linux/stddef.h> +#include <mapmem.h> #include <search.h> #include <errno.h> #include <malloc.h> @@ -368,6 +369,18 @@ int env_get_default_into(const char *name, char *buf, unsigned int len) return env_get_from_linear(default_environment, name, buf, len); } +static int env_update_fdt_addr_from_bloblist(void) +{ + /* + * fdt_addr is by default used by booti, bootm and bootefi, + * thus set it to point to the fdt embedded in a bloblist if it exists. + */ + if (!CONFIG_IS_ENABLED(BLOBLIST) || gd->fdt_src != FDTSRC_BLOBLIST) + return 0; + + return env_set_hex("fdt_addr", (uintptr_t)map_to_sysmem(gd->fdt_blob)); +} + void env_set_default(const char *s, int flags) { if (s) { @@ -392,6 +405,10 @@ void env_set_default(const char *s, int flags) gd->flags |= GD_FLG_ENV_READY; gd->flags |= GD_FLG_ENV_DEFAULT; + + /* This has to be done after GD_FLG_ENV_READY is set */ + if (env_update_fdt_addr_from_bloblist()) + pr_err("Failed to set fdt_addr to point at DTB\n"); } /* [re]set individual variables to their value in the default environment */ @@ -437,7 +454,9 @@ int env_import(const char *buf, int check, int flags) if (himport_r(&env_htab, (char *)ep->data, ENV_SIZE, '\0', flags, 0, 0, NULL)) { gd->flags |= GD_FLG_ENV_READY; - return 0; + + /* This has to be done after GD_FLG_ENV_READY is set */ + return env_update_fdt_addr_from_bloblist(); } pr_err("Cannot import environment: errno = %d\n", errno); 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(); |