diff options
Diffstat (limited to 'doc/develop')
| -rw-r--r-- | doc/develop/release_cycle.rst | 4 | ||||
| -rw-r--r-- | doc/develop/spl.rst | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/develop/release_cycle.rst b/doc/develop/release_cycle.rst index 7aa36166a5d..354ab1b5d74 100644 --- a/doc/develop/release_cycle.rst +++ b/doc/develop/release_cycle.rst @@ -58,7 +58,7 @@ Current Status * The Merge Window for the next release (|next_ver|) is **closed** with the -rc1 release on Monday, 28 July 2025. -* The next branch is now **closed** until the -rc2 release on Monday, 11 August +* The next branch is now **open** with the -rc2 release on Monday, 11 August 2025. * Release "|next_ver|" is scheduled for Monday, 06 October 2025. @@ -73,7 +73,7 @@ For the next scheduled release, release candidates were made on:: * U-Boot |next_ver|-rc1 was released on Mon 28 July 2025. -.. * U-Boot |next_ver|-rc2 was released on Mon 11 August 2025. +* U-Boot |next_ver|-rc2 was released on Mon 11 August 2025. .. * U-Boot |next_ver|-rc3 was released on Mon 25 August 2025. diff --git a/doc/develop/spl.rst b/doc/develop/spl.rst index aa6d28fa333..7f2eac50806 100644 --- a/doc/develop/spl.rst +++ b/doc/develop/spl.rst @@ -142,7 +142,7 @@ fdtgrep is also used to remove: - the properties defined in CONFIG_OF_SPL_REMOVE_PROPS - all the pre-relocation properties ('bootph-all', 'bootph-pre-ram' (SPL), 'bootph-pre-sram' (TPL) and - 'bootph-verify' (TPL)) + 'bootph-verify' (VPL)) All the nodes remaining in the SPL devicetree are bound (see doc/driver-model/design.rst). |