diff options
| author | Tom Rini <[email protected]> | 2025-12-22 16:31:21 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-12-22 16:31:21 -0600 |
| commit | dac8d9c3cc115cc8549b9d012b0f71222a0ebf02 (patch) | |
| tree | 87d0bc2239a0ab7a9867a593d9abc0de5c895ce6 /doc | |
| parent | 29ab19c2beade4cc959e14460975ddf7b6886cec (diff) | |
| parent | 0f6ff53d55ba254de8a995c2a2f5a313acd40ac7 (diff) | |
Merge tag 'v2026.01-rc5' into next
Prepare v2026.01-rc5
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/board/ti/am6254atl_sk.rst | 2 | ||||
| -rw-r--r-- | doc/board/ti/am62x_sk.rst | 2 | ||||
| -rw-r--r-- | doc/develop/pytest/usage.rst | 2 | ||||
| -rw-r--r-- | doc/develop/release_cycle.rst | 2 |
4 files changed, 4 insertions, 4 deletions
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 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``: 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. |