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
diff --git a/doc/README.pxe b/doc/README.pxe
index af2e64a..9fff2cd 100644
--- a/doc/README.pxe
+++ b/doc/README.pxe
@@ -160,7 +160,7 @@
It will passed to bootm with that address.
(see: doc/uImage.FIT/command_syntax_extensions.txt)
It useful for overlay selection in pxe file
- (see: doc/uImage.FIT/overlay-fdt-boot.txt)
+ (see: doc/usage/fit/overlay-fdt-boot.rst).
fdtoverlays <path> [...] - if this label is chosen, use tftp to retrieve the DT
overlay(s) at <path>. it will be temporarily stored at the
diff --git a/doc/build/docker.rst b/doc/build/docker.rst
index 01ed350..4974a98 100644
--- a/doc/build/docker.rst
+++ b/doc/build/docker.rst
@@ -12,7 +12,9 @@
ERROR: Multi-platform build is not supported for the docker driver.
Switch to a different driver, or turn on the containerd image store, and try again.
-You can add a simple one with::
+You can add a simple one with:
+
+.. code-block:: bash
sudo docker buildx create --name multiarch --driver docker-container --use
@@ -20,7 +22,9 @@
architectures request in a build. While both amd64 and arm64 happen in
parallel, the non-native part will take considerably longer as it must use QEMU
to emulate the foreign code. An alternative, if you have accesss to reasonably
-fast amd64 (i.e. 64-bit x86) and arm64 machines is::
+fast amd64 (i.e. 64-bit x86) and arm64 machines is:
+
+.. code-block:: bash
sudo docker buildx create --name multiarch-multinode --node localNode --bootstrap --use
sudo docker buildx create --name multiarch-multinode --append --node remoteNode --bootstrap ssh://user@host
@@ -28,7 +32,7 @@
And this will result in a builder named multiarch-multinode that will build
each platform natively on each node.
-To build the image yourself::
+To build the image yourself:
.. code-block:: bash
diff --git a/doc/usage/cmd/bootflow.rst b/doc/usage/cmd/bootflow.rst
index 5d41fe3..01e7eff 100644
--- a/doc/usage/cmd/bootflow.rst
+++ b/doc/usage/cmd/bootflow.rst
@@ -18,7 +18,7 @@
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 81d0d37..15ebd17 100644
--- a/doc/usage/fdt_overlays.rst
+++ b/doc/usage/fdt_overlays.rst
@@ -76,8 +76,8 @@
* 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 a7db1a3..3d7296a 100644
--- a/doc/usage/fit/overlay-fdt-boot.rst
+++ b/doc/usage/fit/overlay-fdt-boot.rst
@@ -111,6 +111,8 @@
This selects the DTB to use when booting.
+.. _fit_configuration_using_overlays:
+
Configuration using overlays
----------------------------
diff --git a/drivers/misc/qfw_acpi.c b/drivers/misc/qfw_acpi.c
index 0d0cf76..77cebae 100644
--- a/drivers/misc/qfw_acpi.c
+++ b/drivers/misc/qfw_acpi.c
@@ -305,7 +305,7 @@
/* Generate ACPI tables */
end = write_acpi_tables(addr);
gd->arch.table_start = addr;
- gd->arch.table_end = addr;
+ gd->arch.table_end = end;
return 0;
}