diff options
| author | Tom Rini <[email protected]> | 2025-04-03 07:31:28 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-04-03 07:31:28 -0600 |
| commit | 82b69fc4224432d5aefa7ca750d950374cbc7fb2 (patch) | |
| tree | c496ba7267c7376b6950c5beb4305a643a407816 /doc/usage | |
| parent | ce09def8abc3e80e3f9a525b4c050aa4c5cd629b (diff) | |
| parent | 7871285a0a8fb6726ea7537c4f592e117f93768b (diff) | |
Merge tag 'efi-2025-04-rc6' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-2025-04-rc6
CI:
* https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/25491
Documentation:
* correct references to overlay-fdt-boot.txt
* build: docker: Fix code highlighting syntax
* build: docker: Use code-block for syntax highlighting
* Fix typo bootfloe to bootflow
UEFI:
* Correct the size of the AcpiReclaimMemory region for ACPI tables
when using QFW
Diffstat (limited to 'doc/usage')
| -rw-r--r-- | doc/usage/cmd/bootflow.rst | 2 | ||||
| -rw-r--r-- | doc/usage/fdt_overlays.rst | 4 | ||||
| -rw-r--r-- | doc/usage/fit/overlay-fdt-boot.rst | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/doc/usage/cmd/bootflow.rst b/doc/usage/cmd/bootflow.rst index 5d41fe37a7a..01e7eff300b 100644 --- a/doc/usage/cmd/bootflow.rst +++ b/doc/usage/cmd/bootflow.rst @@ -18,7 +18,7 @@ Synopsis bootflow read bootflow boot bootflow cmdline [set|get|clear|delete|auto] <param> [<value>] - bootfloe menu [-t] + bootflow menu [-t] Description ----------- diff --git a/doc/usage/fdt_overlays.rst b/doc/usage/fdt_overlays.rst index 81d0d37f3f1..15ebd17ccb1 100644 --- a/doc/usage/fdt_overlays.rst +++ b/doc/usage/fdt_overlays.rst @@ -76,8 +76,8 @@ There are two ways to apply overlays in U-Boot. * Manually load and apply overlays The remainder of this document will discuss using overlays via the manual -approach. For information on using overlays as part of a FIT image please see: -doc/uImage.FIT/overlay-fdt-boot.txt +approach. For information on using overlays as part of a FIT image please see +:ref:`fit_configuration_using_overlays`. Manually Loading and Applying Overlays -------------------------------------- diff --git a/doc/usage/fit/overlay-fdt-boot.rst b/doc/usage/fit/overlay-fdt-boot.rst index a7db1a37f7a..3d7296ad913 100644 --- a/doc/usage/fit/overlay-fdt-boot.rst +++ b/doc/usage/fit/overlay-fdt-boot.rst @@ -111,6 +111,8 @@ Where config is one of:: This selects the DTB to use when booting. +.. _fit_configuration_using_overlays: + Configuration using overlays ---------------------------- |