diff options
| author | Tom Rini <[email protected]> | 2025-09-27 08:05:53 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-09-27 08:05:53 -0600 |
| commit | 07b7259b8b668e49d413f6ace3d1fe098a67c5fa (patch) | |
| tree | 7d5e2ccd2fa182842fd6eb0f3beadf4ca7d425a7 /doc/usage | |
| parent | 9b45d574af1b64fcd997f08fe702a2d0ecfccbe4 (diff) | |
| parent | a0fe8cedcbe8c76403a77e57eac228b8f778a3ae (diff) | |
Merge tag 'efi-2025-10-rc6' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-2025-10-rc6
CI:
* https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/27745
Docs:
* Correct encodings for spl memory layout diagrams
* Suggest usage of KDOC_WERROR when building documentation
* Replace references to README.fdt-control
* Clarify precedence of environment locations
* Add documentation for the TI am335x_evm board
* Remove README.commands.itest
* Add a note about asking for feedback in the development process
UEFI:
* Cleanup UEFI Variables Kconfig menu
Diffstat (limited to 'doc/usage')
| -rw-r--r-- | doc/usage/environment.rst | 6 | ||||
| -rw-r--r-- | doc/usage/fit/overlay-fdt-boot.rst | 2 |
2 files changed, 4 insertions, 4 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 ----------------------------- diff --git a/doc/usage/fit/overlay-fdt-boot.rst b/doc/usage/fit/overlay-fdt-boot.rst index 3d7296ad913..d687e98ea2a 100644 --- a/doc/usage/fit/overlay-fdt-boot.rst +++ b/doc/usage/fit/overlay-fdt-boot.rst @@ -13,7 +13,7 @@ that matches the desired configuration. This document focuses on specifically using overlays as part of a FIT image. General information regarding overlays including its syntax and building it -can be found in doc/README.fdt-overlays +can be found in :doc:`/usage/fdt_overlays` Configuration without overlays ------------------------------ |