diff options
Diffstat (limited to 'env')
| -rw-r--r-- | env/Kconfig | 2 | ||||
| -rw-r--r-- | env/common.c | 21 | ||||
| -rw-r--r-- | env/mmc.c | 2 |
3 files changed, 22 insertions, 3 deletions
diff --git a/env/Kconfig b/env/Kconfig index 4438f0b392c..9507aeed12a 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -485,7 +485,7 @@ config ENV_FAT_DEVICE_AND_PART string "Device and partition for where to store the environemt in FAT" depends on ENV_IS_IN_FAT default "0:1" if TI_COMMON_CMD_OPTIONS - default "0:auto" if ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL || ARCH_VERSAL_NET + default "0:auto" if ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL || ARCH_VERSAL_NET || ARCH_VERSAL2 default ":auto" if ARCH_SUNXI default "0" if ARCH_AT91 help 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/env/mmc.c b/env/mmc.c index 2ef15fb72e7..8848371eb4f 100644 --- a/env/mmc.c +++ b/env/mmc.c @@ -553,7 +553,7 @@ err: static int env_mmc_load(void) { - if (IS_ENABLED(CONFIG_ENV_IS_EMBEDDED)) + if (IS_ENABLED(ENV_IS_EMBEDDED)) return 0; else if (IS_ENABLED(CONFIG_SYS_REDUNDAND_ENVIRONMENT)) return env_mmc_load_redundant(); |