From: Ricardo Simoes Date: Mon, 15 Sep 2025 14:40:33 +0000 (+0200) Subject: doc: environment: clarify env precedence X-Git-Tag: v2025.10~13^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=75ef35b57849c07708934ed820fed4e3e8bbcc83;p=thirdparty%2Fu-boot.git doc: environment: clarify env precedence Since commit 5cf6a06a it is possible to have both text-based and old-style C environment files. But so far the environment documentation has not reflected this change. This commit fixes that. Signed-off-by: Ricardo Simoes Signed-off-by: Mark Jonas --- diff --git a/doc/usage/environment.rst b/doc/usage/environment.rst index 77197d79380..3764f65c221 100644 --- a/doc/usage/environment.rst +++ b/doc/usage/environment.rst @@ -99,9 +99,6 @@ For this particular issue you can use ``DEFAULT_DEVICE_TREE`` instead:: There is no general way to remove quotes. -If CONFIG_ENV_SOURCE_FILE is empty and the default filename is not present, then -the old-style C environment is used instead. See below. - Old-style C environment ----------------------- @@ -114,6 +111,9 @@ Board maintainers are encouraged to migrate to the text-based environment as it is easier to maintain. The distro-board script still requires the old-style environments, so use :doc:`/develop/bootstd/index` instead. +If both the text-based environment file and the old-style C environment are +defined, the variables from the old-style C environment will override those set +in the text-based environment file. List of environment variables -----------------------------