Prepare v2024.04

Signed-off-by: Tom Rini <[email protected]>

Makefile

@@ -3,7 +3,7 @@
 VERSION = 2024
 PATCHLEVEL = 04
 SUBLEVEL =
-EXTRAVERSION = -rc5
+EXTRAVERSION =
 NAME =
 
 # *DOCUMENTATION*

doc/develop/release_cycle.rst

@@ -48,50 +48,53 @@ Examples::
 Current Status
 --------------
 
-* U-Boot v2024.01 was released on Mon 08 January 2024.
+* U-Boot v2024.04 was released on Tue 02 April 2024.
 
-* The Merge Window for the next release (v2024.04) is **closed**.
+* The Merge Window for the next release (v2024.07) is **open** until the -rc1
+  release on Mon 22 April 2024.
 
 * The next branch is now **closed**.
 
-* Release "v2024.04" is scheduled for 02 April 2024.
+* Release "v2024.07" is scheduled for 01 July 2024.
 
 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 v2024.04-rc1 was released on Mon 29 January 2024.
+.. * U-Boot v2024.07-rc1 was released on Mon 22 April 2024.
 
-* U-Boot v2024.04-rc2 was released on Tue 13 February 2024.
+.. * U-Boot v2024.07-rc2 was released on Tue 06 May 2024.
 
-* U-Boot v2024.04-rc3 was released on Mon 26 February 2024.
+.. * U-Boot v2024.07-rc3 was released on Mon 20 May 2024.
 
-* U-Boot v2024.04-rc4 was released on Mon 11 March 2024.
+.. * U-Boot v2024.07-rc4 was released on Mon 03 June 2024.
 
-* U-Boot v2024.04-rc5 was released on Mon 25 March 2024.
+.. * U-Boot v2024.07-rc5 was released on Mon 17 June 2024.
 
 Please note that the following dates are planned only and may be deviated from
 as needed.
 
-* "v2024.04": end of MW = Mon, Jan 29, 2024; release = Tue, Apr 02, 2024
-
 * "v2024.07": end of MW = Mon, Apr 22, 2024; release = Mon, Jul 01, 2024
 
 * "v2024.10": end of MW = Mon, Jul 22, 2024; release = Mon, Oct 07, 2024
 
 * "v2025.01": end of MW = Mon, Oct 21, 2024; release = Mon, Jan 06, 2025
 
+* "v2025.04": end of MW = Mon, Jan 27, 2025; release = Mon, Apr 07, 2025
+
 Previous Releases
 -----------------
 
 Note: these statistics are generated by our fork of `gitdm
 <https://source.denx.de/u-boot/gitdm>`_, which was originally created by
 Jonathan Corbet.
 
+* :doc:`statistics/u-boot-stats-v2024.04` which was released on 02 April 2024.
+
 * :doc:`statistics/u-boot-stats-v2024.01` which was released on 08 January 2024.
 
 * :doc:`statistics/u-boot-stats-v2023.10` which was released on 02 October 2023.