Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-04 12:04:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Pull request efi-2025-04-rc6

Browse source 
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
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEK7wKXt3/btL6/yA+hO4vgnE3U0sFAmfuRW4ACgkQhO4vgnE3
 U0uw0RAApYLbEkSIoosE1riOoq+VR0HF8jH59hpCLxgGEaNxP4nISyoQeNlnp9Np
 2uO/gyBVv5ZObKlaEG38vfbAhySbLQECB2efz1WnJ0axPFxtPhyTi66VdAP2EB/b
 JS3ygyGRJqGr9pk8XViXMiNjp9q0D/2JwU3aHGKKaX95BTg+7uZSYcmSdzZdLKQN
 auB5dFuADE7ZBXQe0MEaOndgjLrDn74SWejYstJcHYWI5xAm8DlOmfoLRT2pNITr
 uWPtmt/+PZ8x+HDKtuKYzDD0XXwH77PVS4mDUztXhYFEZWoY0q+vdtL2chti9LPg
 H2u3fH3K4grAMCLFbLseAbYjCQ4CUhbZmy8x7Qu++D5Jjfa3Oc63QzM2ueYOg3Vv
 PveaD4nfToy4kAWGIRyG2aZYJrVy7MNpHtfyVfqWIgooBkSxV6RjOmJrB15fYN0G
 V4tUox8zYQHA7Dz2VpIM2ErplTAMNiaS4dPFFXpfqD42vj126aqVjlXh7TrO7g8+
 eSdlv003FYyTjY/i6cMxhsCjZ83lldnNqtRww6g4r+P7KF+VAGKg8ViFEQY2HR6L
 gSqi3mQKYhKTaU7z74cdoTdD6C+1iyOnNfjb74fYZMiCG9i7AeH4CV9mnohfrnCo
 aD6kBu2A7vT3IRsuVCmClQTkvyYz1cjkIUFSqY/k1E7cm9kgIGE=
 =vXm2
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Tom Rini 2025-04-03 07:31:28 -06:00
commit 82b69fc422
6 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/README.pxe
View file

@ -160,7 +160,7 @@ kernel <path> - if this label is chosen, use tftp to retrieve the kernel
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

10
doc/build/docker.rst vendored
View file

@ -12,7 +12,9 @@ You will need a multi-platform container, otherwise this error is shown::
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 @@ This will result in a builder that will use QEMU for the non-native
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 @@ fast amd64 (i.e. 64-bit x86) and arm64 machines is::
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

2
doc/usage/cmd/bootflow.rst
View file

@ -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
-----------

4
doc/usage/fdt_overlays.rst
View file

@ -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
--------------------------------------

2
doc/usage/fit/overlay-fdt-boot.rst
View file

@ -111,6 +111,8 @@ Where config is one of::
This selects the DTB to use when booting.
.. _fit_configuration_using_overlays:
Configuration using overlays
----------------------------

2
drivers/misc/qfw_acpi.c
View file

@ -305,7 +305,7 @@ static int evt_write_acpi_tables(void)
/* 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;
}