From 85deb7f69ca4467cf5cf75545b253f9414908222 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 26 Aug 2024 10:39:17 -0600 Subject: doc/develop/sending_patches.rst: Clarify when to use which branch The previous wording on the paragraph about what branch to use when submitting patches did not reflect how / when the next branch is currently used. Reword this to note that master should be used for bug and regression fixes, always, and that next should be used once it opens, with -rc2. Reported-by: Jerome Forissier Signed-off-by: Tom Rini Reviewed-by: Quentin Schulz Acked-by: Jerome Forissier Reviewed-by: Heinrich Schuchardt --- doc/develop/sending_patches.rst | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/doc/develop/sending_patches.rst b/doc/develop/sending_patches.rst index 3f25b1d0466..9308f428bbd 100644 --- a/doc/develop/sending_patches.rst +++ b/doc/develop/sending_patches.rst @@ -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. -- cgit v1.3.1 From 6638f3a918b467fd795dffac6cbdc4d8fc779227 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 26 Aug 2024 10:49:52 -0600 Subject: doc/arch/m68k.rst: Update toolchain comment The old wiki page has not exited for quite some time, update to note what we build with in CI at least. Signed-off-by: Tom Rini --- doc/arch/m68k.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 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 +`_ are +used in the project CI builds. ColdFire specific configuration options/settings ------------------------------------------------ -- cgit v1.3.1 From 19fac2b1d0d3ffeeb71e6ee6ca0b88b8bf6beb52 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 26 Aug 2024 10:49:53 -0600 Subject: doc/arch/mips.rst: Update toolchain list Remove both the ELDK and emdebian links as they are broken, and add a link to the kernel.org toolchains which we use in CI. Signed-off-by: Tom Rini --- doc/arch/mips.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 `_ - * `Embedded Debian -- Cross-development toolchains `_ * `Buildroot `_ + * `kernel.org cross-development toolchains `_ Known Issues ------------ -- cgit v1.3.1 From 8002b1c07c2146afd907f2cad6a0c053c5d061c8 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 26 Aug 2024 10:49:54 -0600 Subject: doc: Update rST to not reference the old wiki In two places we had references to the old wiki pages instead of links to the relevant part of our documentation. Update (and slightly reword) these spots. Signed-off-by: Tom Rini --- doc/develop/process.rst | 5 ++--- doc/develop/version.rst | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) 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 -`_. 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/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 -- cgit v1.3.1 From 656b32710a085455920a0b0fff42de782c762a1d Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 26 Aug 2024 10:49:55 -0600 Subject: doc/mkeficapsule.1: Update homepage link The project home page is no longer the old wiki, but https://www.u-boot.org/ Signed-off-by: Tom Rini --- doc/mkeficapsule.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/mkeficapsule.1 b/doc/mkeficapsule.1 index c3d0f21488a..eaaba2cf232 100644 --- a/doc/mkeficapsule.1 +++ b/doc/mkeficapsule.1 @@ -130,4 +130,4 @@ The directory in which all capsule files be placed Written by AKASHI Takahiro .SH HOMEPAGE -http://www.denx.de/wiki/U-Boot/WebHome +http://www.u-boot.org/ -- cgit v1.3.1 From 7387be522efe2ead220fadc1e249d06aaf435719 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 26 Aug 2024 10:49:56 -0600 Subject: bootcount: Update to point to current documentation The current documentation for the bootcount API is on our website and not the old wiki, update the link in two places. Signed-off-by: Tom Rini --- doc/device-tree-bindings/bootcount-syscon.txt | 2 +- drivers/bootcount/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig index 2105cea3d45..d375984bb33 100644 --- a/drivers/bootcount/Kconfig +++ b/drivers/bootcount/Kconfig @@ -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 -- cgit v1.3.1 From ff994a3c2ed0e8d233bcc6f0176ef21ea9c75009 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 26 Aug 2024 10:49:57 -0600 Subject: binman: Update links for sending patches When linking to our documentation for submitting patches, we shouldn't point at the old wiki but instead our current documentation. Signed-off-by: Tom Rini --- tools/binman/entries.rst | 2 +- tools/binman/etype/atf_fip.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/binman/entries.rst b/tools/binman/entries.rst index 12482703782..d82f7b89203 100644 --- a/tools/binman/entries.rst +++ b/tools/binman/entries.rst @@ -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 diff --git a/tools/binman/etype/atf_fip.py b/tools/binman/etype/atf_fip.py index 73a3f85b9f4..3da0dfcfc12 100644 --- a/tools/binman/etype/atf_fip.py +++ b/tools/binman/etype/atf_fip.py @@ -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 -- cgit v1.3.1