diff options
| author | Christophe Leroy <christophe.leroy@csgroup.eu> | 2023-05-11 08:16:49 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-05-15 17:14:46 -0400 |
| commit | 40b77f2a3ac13a7547c1b7c9c51a4090869de8f4 (patch) | |
| tree | 91d38b825fa1aa68c4edddd2847d704905efbb11 | |
| parent | c9901bd2adad104adb132bdcc92fe2e86b4bcaa0 (diff) | |
| download | u-boot-40b77f2a3ac13a7547c1b7c9c51a4090869de8f4.tar.gz | |
envtools lack extra settings since commit 86b9c3e4e4 ("env: Allow U-Boot scripts to be placed in
After converting my targets from CFG_EXTRA_ENV_SETTINGS to
CONFIG_EXTRA_ENV_TEXT as suggested by Tom, I discovered that
fw_setenv doesn't set the entire defaut environment anymore.
I tried to fix it with the below patch, but it fails qemu-x86 CI test,
see https://source.denx.de/u-boot/custodians/u-boot-mpc8xx/-/pipelines/16326
That's the only CI test that fails AFAICS.
Could you help with a solution ? This needs to be fixed.
Thanks
Christophe
---- >8 ----
From: Christophe Leroy <christophe.leroy@csgroup.eu>
Subject: [RFC PATCH] envtools: Fix default environment
After converting some targets from CFG_EXTRA_ENV_SETTINGS to
CONFIG_EXTRA_ENV_TEXT, default environment embedded in
fw_env tool missed all extra settings.
Commit 86b9c3e4e4 ("env: Allow U-Boot scripts to be placed in
a .env file") restricted the inclusion of the content of that
file to builds without USE_HOSTCC.
But as mentionned in commit 79fc0c5f49 ("tools/env: cross-compile
fw_printenv without setting HOSTCC"), HOSTCC and USE_HOSTCC are
kept for code re-use.
Remove the restricting so that settings included in a .env
file are also added to fw_env tool.
Fixes: 86b9c3e4e4 ("env: Allow U-Boot scripts to be placed in a .env file")
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | include/env_default.h | 2 |
2 files changed, 1 insertions, 3 deletions
@@ -2119,7 +2119,7 @@ tools/version.h: include/version.h $(Q)mkdir -p $(dir $@) $(call if_changed,copy) -envtools: scripts_basic $(version_h) $(timestamp_h) tools/version.h +envtools: u-boot-initial-env scripts_basic $(version_h) $(timestamp_h) tools/version.h $(Q)$(MAKE) $(build)=tools/env tools-only: export TOOLS_ONLY=y diff --git a/include/env_default.h b/include/env_default.h index c0df39d62f..b16c22d5a2 100644 --- a/include/env_default.h +++ b/include/env_default.h @@ -10,9 +10,7 @@ #include <env_callback.h> #include <linux/stringify.h> -#ifndef USE_HOSTCC #include <generated/environment.h> -#endif #ifdef DEFAULT_ENV_INSTANCE_EMBEDDED env_t embedded_environment __UBOOT_ENV_SECTION__(environment) = { |