summaryrefslogtreecommitdiff
path: root/doc/develop
diff options
context:
space:
mode:
Diffstat (limited to 'doc/develop')
-rw-r--r--doc/develop/codingstyle.rst6
l---------doc/develop/package/bintools.rst1
l---------doc/develop/package/entries.rst1
-rw-r--r--doc/develop/pytest/test_fit.rst10
-rw-r--r--doc/develop/pytest/usage.rst4
-rw-r--r--doc/develop/release_cycle.rst16
6 files changed, 25 insertions, 13 deletions
diff --git a/doc/develop/codingstyle.rst b/doc/develop/codingstyle.rst
index 2a69162fa95..26881cf3900 100644
--- a/doc/develop/codingstyle.rst
+++ b/doc/develop/codingstyle.rst
@@ -80,8 +80,10 @@ Code Formatting with clang-format
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
U-Boot provides a `.clang-format` configuration file that was copied directly
-from the Linux kernel without any modifications, ensuring complete compatibility
-with kernel coding standards. Here are common ways to use clang-format:
+from the Linux kernel, ensuring complete compatibility with kernel coding
+standards.
+
+Here are common ways to use clang-format:
**Basic usage for single files:**
diff --git a/doc/develop/package/bintools.rst b/doc/develop/package/bintools.rst
deleted file mode 120000
index 7ef3d75e935..00000000000
--- a/doc/develop/package/bintools.rst
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/binman/bintools.rst \ No newline at end of file
diff --git a/doc/develop/package/entries.rst b/doc/develop/package/entries.rst
deleted file mode 120000
index ecedcebaad4..00000000000
--- a/doc/develop/package/entries.rst
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/binman/entries.rst \ No newline at end of file
diff --git a/doc/develop/pytest/test_fit.rst b/doc/develop/pytest/test_fit.rst
new file mode 100644
index 00000000000..3a2359f1e89
--- /dev/null
+++ b/doc/develop/pytest/test_fit.rst
@@ -0,0 +1,10 @@
+.. SPDX-License-Identifier: GPL-2.0+
+
+test_fit
+========
+
+.. automodule:: test_fit
+ :synopsis:
+ :member-order: bysource
+ :members:
+ :undoc-members:
diff --git a/doc/develop/pytest/usage.rst b/doc/develop/pytest/usage.rst
index e9296fd1f44..6002244d608 100644
--- a/doc/develop/pytest/usage.rst
+++ b/doc/develop/pytest/usage.rst
@@ -546,11 +546,11 @@ following annotation for a test requires ``CONFIG_EFI_LOADER=y``:
Sometimes multiple configuration option supply the same functionality. If
multiple arguments are passed to ``buildconfigspec()``, only one of the
configuration options needs to be set. The following annotation requires that
-either of ``CONFIG_NET`` or ``CONFIG_NET_LWIP`` is set:
+either of ``CONFIG_NET_LEGACY`` or ``CONFIG_NET_LWIP`` is set:
.. code-block:: python
- @pytest.mark.buildconfigspec('net', 'net_lwip')
+ @pytest.mark.buildconfigspec('net_legacy', '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 69678f2897a..9a3ebd7e5f8 100644
--- a/doc/develop/release_cycle.rst
+++ b/doc/develop/release_cycle.rst
@@ -55,10 +55,10 @@ Current Status
* U-Boot v2026.04 was released on Monday, 06 April 2026.
-* The Merge Window for the next release (|next_ver|) is **open** until the -rc1
+* The Merge Window for the next release (|next_ver|) is **closed** with the -rc1
release on Monday, 27 April 2026.
-* The next branch is now **closed** until the -rc2 release on Monday, 11
+* The next branch is now **open** with the -rc2 release on Monday, 11
May 2026.
* Release "|next_ver|" is scheduled for Monday, 06 July 2026.
@@ -69,15 +69,17 @@ Future Releases
.. The following commented out dates are for when release candidates are
planned to be tagged.
-.. For the next scheduled release, release candidates were made on:
+For the next scheduled release, release candidates were made on:
-.. * U-Boot |next_ver|-rc1 was released on Mon 11 May 2026.
+* U-Boot |next_ver|-rc1 was released on Mon 27 April 2026.
-.. * U-Boot |next_ver|-rc2 was released on Mon 25 May 2026.
+* U-Boot |next_ver|-rc2 was released on Mon 11 May 2026.
-.. * U-Boot |next_ver|-rc3 was released on Mon 08 June 2026.
+.. * U-Boot |next_ver|-rc3 was released on Mon 25 May 2026.
-.. * U-Boot |next_ver|-rc4 was released on Mon 22 June 2026.
+.. * U-Boot |next_ver|-rc4 was released on Mon 08 June 2026.
+
+.. * U-Boot |next_ver|-rc5 was released on Mon 22 June 2026.
Please note that the following dates are planned only and may be deviated from
as needed.