u-boot: Upgrade to 2023.10

Upgrade to U-Boot 2023.10.

The U-Boot 2023.10 tag is in the master branch, so switch the branch
back to master.

Signed-off-by: Fabio Estevam <festevam@denx.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-bsp/u-boot/u-boot-common.inc b/meta/recipes-bsp/u-boot/u-boot-common.inc
index 111914827d60338f2a529cb44506e0ed35e67901..c7190d5cd479839c5ce462ad17df9c9ed78c268c 100644 (file)
--- a/meta/recipes-bsp/u-boot/u-boot-common.inc
+++ b/meta/recipes-bsp/u-boot/u-boot-common.inc
@@ -12,9 +12,9 @@ PE = "1"
 
 # We use the revision in order to avoid having to fetch it from the
 # repo during parse
-SRCREV = "83cdab8b2c6ea0fc0860f8444d083353b47f1d5c"
+SRCREV = "4459ed60cb1e0562bc5b40405e2b4b9bbf766d57"
 
-SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=u-boot-2023.07.y"
+SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master"
 
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"

diff --git a/meta/recipes-bsp/u-boot/u-boot-tools_2023.07.02.bb b/meta/recipes-bsp/u-boot/u-boot-tools_2023.10.bb
similarity index 100%
rename from meta/recipes-bsp/u-boot/u-boot-tools_2023.07.02.bb
rename to meta/recipes-bsp/u-boot/u-boot-tools_2023.10.bb

diff --git a/meta/recipes-bsp/u-boot/u-boot_2023.07.02.bb b/meta/recipes-bsp/u-boot/u-boot_2023.10.bb
similarity index 100%
rename from meta/recipes-bsp/u-boot/u-boot_2023.07.02.bb
rename to meta/recipes-bsp/u-boot/u-boot_2023.10.bb