aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2024-09-16 14:48:13 -0600
committerTom Rini <trini@konsulko.com>2024-09-16 14:48:13 -0600
commit19dbc09405d3503ce3efef3c2e4b4f0f1a03372d (patch)
treeeb40b0e0cb3c32dbafb25cc7fb6f988908c32ca9 /doc
parent979207ed6bac1b148802abb85750fc5e9cea223e (diff)
parentc97ada2dc66934ee00a7a03d9ed078bdfb7b4039 (diff)
downloadu-boot-19dbc09405d3503ce3efef3c2e4b4f0f1a03372d.tar.gz
Merge tag 'v2024.10-rc5' into next
Prepare v2024.10-rc5
Diffstat (limited to 'doc')
-rw-r--r--doc/arch/m68k.rst6
-rw-r--r--doc/arch/mips.rst3
-rw-r--r--doc/develop/process.rst5
-rw-r--r--doc/develop/sending_patches.rst13
-rw-r--r--doc/develop/version.rst2
-rw-r--r--doc/device-tree-bindings/bootcount-syscon.txt2
-rw-r--r--doc/mkeficapsule.12
7 files changed, 16 insertions, 17 deletions
diff --git a/doc/arch/m68k.rst b/doc/arch/m68k.rst
index 8474ece62c7..de7eb384955 100644
--- a/doc/arch/m68k.rst
+++ b/doc/arch/m68k.rst
@@ -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
------------------------------------------------
diff --git a/doc/arch/mips.rst b/doc/arch/mips.rst
index b8166087ddf..aeb58247943 100644
--- a/doc/arch/mips.rst
+++ b/doc/arch/mips.rst
@@ -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
------------
diff --git a/doc/develop/process.rst b/doc/develop/process.rst
index 0542b3fc124..0c6fb31e87b 100644
--- a/doc/develop/process.rst
+++ b/doc/develop/process.rst
@@ -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*.
diff --git a/doc/develop/sending_patches.rst b/doc/develop/sending_patches.rst
index 3f25b1d0466..e22b5e3e244 100644
--- a/doc/develop/sending_patches.rst
+++ b/doc/develop/sending_patches.rst
@@ -73,12 +73,13 @@ 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 located at
+ 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.
diff --git a/doc/develop/version.rst b/doc/develop/version.rst
index 5c9046aa17a..de11836af45 100644
--- a/doc/develop/version.rst
+++ b/doc/develop/version.rst
@@ -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
diff --git a/doc/device-tree-bindings/bootcount-syscon.txt b/doc/device-tree-bindings/bootcount-syscon.txt
index e124f7b6142..ea27b246c8a 100644
--- a/doc/device-tree-bindings/bootcount-syscon.txt
+++ b/doc/device-tree-bindings/bootcount-syscon.txt
@@ -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".
diff --git a/doc/mkeficapsule.1 b/doc/mkeficapsule.1
index a5545f7898a..a726149ba2c 100644
--- a/doc/mkeficapsule.1
+++ b/doc/mkeficapsule.1
@@ -153,4 +153,4 @@ The directory in which all capsule files be placed
Written by AKASHI Takahiro <takahiro.akashi@linaro.org>
.SH HOMEPAGE
-http://www.denx.de/wiki/U-Boot/WebHome
+http://www.u-boot.org/