summaryrefslogtreecommitdiff
path: root/doc/develop
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2024-11-09 08:05:41 -0600
committerTom Rini <[email protected]>2024-11-09 08:05:41 -0600
commitf448c4517b55f4018271cdf014615eb54121d863 (patch)
treeb7974f966aacb07af9630b3c3e8cd0be56e17e61 /doc/develop
parenta7a96a37cbd875994bc8d25adb0536bf00e4a30e (diff)
parent70b78d52937b5f18afbbc4257bd3b89b0e75a186 (diff)
Merge tag 'efi-2025-01-rc2-2' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-2025-01-rc2-2 Documentation: * correct title and author of rst2pdf generated pdf * describe CONFIG_DEBUG_SBI_CONSOLE * remove vile language UEFI * correct printf codes in mkeficapsule * add an EFI test app * move default filename to a function * move get_efi_pxe_arch() to efi_helper * allow reporting the host defaults in efidebug * drop sandbox PXE architecture Other: * do not reserve extra 16 KiB of stack in lmb * disable the sandbox virtio blk device * provide -N command line flag to control EFI default boot file name on the sandbox * provide a unit test for the efi bootmeth
Diffstat (limited to 'doc/develop')
-rw-r--r--doc/develop/devicetree/control.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/develop/devicetree/control.rst b/doc/develop/devicetree/control.rst
index 211f7e4909c..0233945f8b6 100644
--- a/doc/develop/devicetree/control.rst
+++ b/doc/develop/devicetree/control.rst
@@ -89,7 +89,7 @@ Failing that, you could write one from scratch yourself!
Resyncing with devicetree-rebasing
----------------------------------
-The `devicetree-rebasing repository`_ maintains a fork cum mirror copy of
+The `devicetree-rebasing repository`_ maintains a mirror copy of
devicetree files along with the bindings synced at every Linux kernel major
release or intermediate release candidates. The U-Boot maintainers regularly
sync the `dts/upstream/` subtree from the devicetree-rebasing repo whenever