diff options
| author | Ricardo Simoes <[email protected]> | 2025-09-15 16:40:33 +0200 |
|---|---|---|
| committer | Heinrich Schuchardt <[email protected]> | 2025-09-27 09:11:34 +0200 |
| commit | 75ef35b57849c07708934ed820fed4e3e8bbcc83 (patch) | |
| tree | 7fa5e3d7deab9daf25debe7b6b27a6e79f5fdce6 /doc/usage | |
| parent | e59e10240c69ecae8ef55e4bbb2e9a6cf5c24cef (diff) | |
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 <[email protected]>
Signed-off-by: Mark Jonas <[email protected]>
Diffstat (limited to 'doc/usage')
| -rw-r--r-- | doc/usage/environment.rst | 6 |
1 files changed, 3 insertions, 3 deletions
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 ----------------------------- |
