colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge patch series "bloblist: fix the overriding of fdt from bloblist"

Browse Source 
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
This commit is contained in:
Tom Rini
2025-04-28 10:13:42 -06:00
parent d2eef3a4a7 bd5dde0346
commit b2b2a21b87
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
env/common.c vendored
View File

@@ -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);