Skip to content

Commit

Permalink
Merge tag 'doc-2024-10-rc4' of https://source.denx.de/u-boot/custodia…
Browse files Browse the repository at this point in the history
…ns/u-boot-efi

Pull request doc-2024-10-rc4

* doc/develop/sending_patches.rst: Clarify when to use which branch
* doc/arch/m68k.rst: Update toolchain comment
* doc/arch/mips.rst: Update toolchain list
* doc: Update rST to not reference the old wiki
* doc/mkeficapsule.1: Update homepage link
* bootcount: Update to point to current documentation
* binman: Update links for sending patches
  • Loading branch information
trini committed Sep 13, 2024
2 parents 5f04493 + ff994a3 commit a7b83ad
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 20 deletions.
6 changes: 3 additions & 3 deletions doc/arch/m68k.rst
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ A bash script similar to the one below may be used:
Adopted toolchains
------------------

Please check:
https://www.denx.de/wiki/U-Boot/ColdFireNotes

Currently the `kernel.org cross-development toolchains
<https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/>`_ are
used in the project CI builds.

ColdFire specific configuration options/settings
------------------------------------------------
Expand Down
3 changes: 1 addition & 2 deletions doc/arch/mips.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@ Notes for the MIPS architecture port of U-Boot
Toolchains
----------

* `ELDK < DULG < DENX <http://www.denx.de/wiki/DULG/ELDK>`_
* `Embedded Debian -- Cross-development toolchains <http://www.emdebian.org/crosstools.html>`_
* `Buildroot <http://buildroot.uclibc.org/>`_
* `kernel.org cross-development toolchains <https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/>`_

Known Issues
------------
Expand Down
5 changes: 2 additions & 3 deletions doc/develop/process.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,8 @@ Management Summary
Phases of the Development Process
---------------------------------

U-Boot development takes place in `Release Cycles
<https://www.denx.de/wiki/U-Boot/ReleaseCycle>`_. A Release Cycle lasts
normally for three months.
U-Boot development takes place in a :doc:`release_cycle`. A Release Cycle
lasts normally for three months.

The first three weeks of each Release Cycle are called *Merge Window*.

Expand Down
14 changes: 8 additions & 6 deletions doc/develop/sending_patches.rst
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,14 @@ General Patch Submission Rules
cover letter why they are ignored is desired.

* Send your patches as plain text messages: no HTML, no MIME, no links, no
compression, no attachments. Just plain text. The best way the generate
patches is by using the ``git format-patch`` command. Please use the
``master`` branch of the mainline U-Boot git repository
(``https://source.denx.de/u-boot/u-boot.git``) as reference, unless (usually
late in a release cycle) there has been an announcement to use the ``next``
branch of this repository instead.
compression, no attachments. Just plain text. The best way to generate
patches is by using the ``git format-patch`` command. For a patch that is
fixing a bug or regression of some sort, please use the ``master`` branch of
the mainline U-Boot git repository
(``https://source.denx.de/u-boot/u-boot.git``) as reference. For new
features, if the ``next`` branch has been opened (which happens with the
release of ``-rc2``) that branch should be used, otherwise ``master`` is
acceptable.

* Make sure that your mailer does not mangle the patch by automatic changes
like wrapping of longer lines etc.
Expand Down
2 changes: 1 addition & 1 deletion doc/develop/version.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ release that came out in October 2020. Release candidates are tagged every few
weeks as the project heads to the next release. So 2020.10-rc1 was the first
release candidate (RC), tagged soon after 2020.07 was released.

See https://www.denx.de/wiki/view/U-Boot/ReleaseCycle for full details.
See :doc:`release_cycle` for full details.

Within the build system, various Makefile variables are created, making use of
VERSION, PATCHLEVEL and EXTRAVERSION defined at the top of 'Makefile'. There is
Expand Down
2 changes: 1 addition & 1 deletion doc/device-tree-bindings/bootcount-syscon.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Bootcount Configuration
This is the implementation of the feature as described in
https://www.denx.de/wiki/DULG/UBootBootCountLimit.
https://docs.u-boot.org/en/latest/api/bootcount.html

Required Properties:
- compatible: must be "u-boot,bootcount-syscon".
Expand Down
2 changes: 1 addition & 1 deletion doc/mkeficapsule.1
Original file line number Diff line number Diff line change
Expand Up @@ -130,4 +130,4 @@ The directory in which all capsule files be placed
Written by AKASHI Takahiro <[email protected]>

.SH HOMEPAGE
http://www.denx.de/wiki/U-Boot/WebHome
http://www.u-boot.org/
2 changes: 1 addition & 1 deletion drivers/bootcount/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ menuconfig BOOTCOUNT_LIMIT
bool "Enable support for checking boot count limit"
help
Enable checking for exceeding the boot count limit.
More information: http://www.denx.de/wiki/DULG/UBootBootCountLimit
More information: https://docs.u-boot.org/en/latest/api/bootcount.html

if BOOTCOUNT_LIMIT

Expand Down
2 changes: 1 addition & 1 deletion tools/binman/entries.rst
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ FIPs so that binman and other tools can access the entire image correctly.

.. _FIP: https://trustedfirmware-a.readthedocs.io/en/latest/design/firmware-design.html#firmware-image-package-fip
.. _`TF-A source tree`: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git
.. _`send a patch`: https://www.denx.de/wiki/U-Boot/Patches
.. _`send a patch`: https://docs.u-boot.org/en/latest/develop/sending_patches.html



Expand Down
2 changes: 1 addition & 1 deletion tools/binman/etype/atf_fip.py
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ class Entry_atf_fip(Entry_section):
.. _FIP: https://trustedfirmware-a.readthedocs.io/en/latest/design/firmware-design.html#firmware-image-package-fip
.. _`TF-A source tree`: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git
.. _`send a patch`: https://www.denx.de/wiki/U-Boot/Patches
.. _`send a patch`: https://docs.u-boot.org/en/latest/develop/sending_patches.html
"""
def __init__(self, section, etype, node):
# Put this here to allow entry-docs and help to work without libfdt
Expand Down

0 comments on commit a7b83ad

Please sign in to comment.