From d865f2f0162b1121f271bd3e6c1e3f171036aec9 Mon Sep 17 00:00:00 2001 From: Anshul Dalal Date: Thu, 18 Dec 2025 10:31:55 +0530 Subject: doc: board: ti: fix alt name for tispl.bin in DFU mode The alt name for tispl binary is "tispl.bin" and not "tispl", this patch fixes the documentation to the correct alt name. Fixes: def64b493748 ("doc: board: Add document for DFU boot on am62x SoCs") Fixes: 3633fdbb6b90 ("ti: add support for AM6254atl SiP") Signed-off-by: Anshul Dalal Reviewed-by: Mattijs Korpershoek --- doc/board/ti/am6254atl_sk.rst | 2 +- doc/board/ti/am62x_sk.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/board/ti/am6254atl_sk.rst b/doc/board/ti/am6254atl_sk.rst index cf58ed4c03f..7776ffb14cb 100644 --- a/doc/board/ti/am6254atl_sk.rst +++ b/doc/board/ti/am6254atl_sk.rst @@ -280,7 +280,7 @@ When using dfu-util the following commands can be used to boot to a U-Boot shell .. prompt:: bash $ dfu-util -a bootloader -D tiboot3.bin - dfu-util -R -a tispl -D tispl.bin + dfu-util -R -a tispl.bin -D tispl.bin dfu-util -R -a u-boot.img -D u-boot.img Debugging U-Boot diff --git a/doc/board/ti/am62x_sk.rst b/doc/board/ti/am62x_sk.rst index 1a0e5e07c4b..b50fff87506 100644 --- a/doc/board/ti/am62x_sk.rst +++ b/doc/board/ti/am62x_sk.rst @@ -329,7 +329,7 @@ When using dfu-util the following commands can be used to boot to a U-Boot shell .. prompt:: bash $ dfu-util -a bootloader -D tiboot3.bin - dfu-util -R -a tispl -D tispl.bin + dfu-util -R -a tispl.bin -D tispl.bin dfu-util -R -a u-boot.img -D u-boot.img .. am62x_evm_rst_include_end_dfu_boot -- cgit v1.3.1 From 24ab2b9684d72af960a7145a88c34ab0ec801c84 Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Wed, 17 Dec 2025 15:02:27 +0100 Subject: doc: pytest: fix typo in multiple config options example for buildconfigspec The option should be 'net_lwip' and not 'net lwip' (see all usage of it in the test code base). Fixes: 2bac578c5aba ("test: allow multiple config options in buildconfigspec") Signed-off-by: Quentin Schulz Reviewed-by: Jerome Forissier Reviewed-by: Mattijs Korpershoek --- doc/develop/pytest/usage.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/develop/pytest/usage.rst b/doc/develop/pytest/usage.rst index df3821da20d..924bc185b51 100644 --- a/doc/develop/pytest/usage.rst +++ b/doc/develop/pytest/usage.rst @@ -546,7 +546,7 @@ either of ``CONFIG_NET`` or ``CONFIG_NET_LWIP`` is set: .. code-block:: python - @pytest.mark.buildconfigspec('net', 'net lwip') + @pytest.mark.buildconfigspec('net', 'net_lwip') The ``notbuildconfigspec()`` annotation can be used to require a configuration option not to be set. The following annotation requires ``CONFIG_RISCV=n``: -- cgit v1.3.1 From 0f6ff53d55ba254de8a995c2a2f5a313acd40ac7 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 22 Dec 2025 16:26:11 -0600 Subject: Prepare v2026.01-rc5 Signed-off-by: Tom Rini --- Makefile | 2 +- doc/develop/release_cycle.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/Makefile b/Makefile index 571c07e0e9c..8cb9a06f6a4 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ VERSION = 2026 PATCHLEVEL = 01 SUBLEVEL = -EXTRAVERSION = -rc4 +EXTRAVERSION = -rc5 NAME = # *DOCUMENTATION* diff --git a/doc/develop/release_cycle.rst b/doc/develop/release_cycle.rst index be6b09b250e..2f4f5e4a845 100644 --- a/doc/develop/release_cycle.rst +++ b/doc/develop/release_cycle.rst @@ -79,7 +79,7 @@ For the next scheduled release, release candidates were made on: * U-Boot |next_ver|-rc4 was released on Mon 08 December 2025. -.. * U-Boot |next_ver|-rc5 was released on Tue 22 December 2025. +* U-Boot |next_ver|-rc5 was released on Mon 22 December 2025. Please note that the following dates are planned only and may be deviated from as needed. -- cgit v1.3.1