summaryrefslogtreecommitdiff
path: root/doc/usage
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2023-08-09 13:17:34 -0400
committerTom Rini <[email protected]>2023-08-09 13:17:34 -0400
commitec58228830a1f68e8e65099387cf12c5a91c9e72 (patch)
tree391ed6ad5f3fddcb88c976b0d413fa3912e68c40 /doc/usage
parentf26eda936bfb49c99d3c7829d416809013b95d3f (diff)
parent9234b77b9d42ebd77585091a072b4ab958ba83ed (diff)
Merge tag 'x86-pull-20230809' of https://source.denx.de/u-boot/custodians/u-boot-x86
- x86: Fixes for distro booting - x86: Move some boards to text environment
Diffstat (limited to 'doc/usage')
-rw-r--r--doc/usage/environment.rst8
1 files changed, 7 insertions, 1 deletions
diff --git a/doc/usage/environment.rst b/doc/usage/environment.rst
index 2c44e5da6aa..c6439dde668 100644
--- a/doc/usage/environment.rst
+++ b/doc/usage/environment.rst
@@ -81,6 +81,12 @@ Example::
echo CONFIG_SYS_BOARD boot failed - please check your image
echo Load address is CONFIG_SYS_LOAD_ADDR
+Settings which are common to a group of boards can use #include to bring in
+a common file in the `include/env` directory, containing environment
+settings. For example::
+
+ #include <env/ti/mmc.env>
+
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.
@@ -94,7 +100,7 @@ to add environment variables.
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
-environment but work is underway to address this.
+environments, so use :doc:`../develop/bootstd` instead.
List of environment variables