sysutils/u-boot-*: Update to 2024.01

Sponsored by:	Beckhoff Automation GmbH & Co. KG

12 files changed, 4 insertions, 66 deletions

diff --git a/sysutils/u-boot-bhyve-arm64/Makefile b/sysutils/u-boot-bhyve-arm64/Makefile
index 1d4ccde6a4db..380254843ab6 100644
--- a/sysutils/u-boot-bhyve-arm64/Makefile
+++ b/sysutils/u-boot-bhyve-arm64/Makefile
@@ -1,7 +1,5 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
-U_BOOT_SLAVE_PORTREVISION_2023.10=	1
-
 MODEL=		bhyve-arm64
 BOARD_CONFIG=	bhyve_arm64_defconfig
 FAMILY=		bhyve
diff --git a/sysutils/u-boot-master/Makefile b/sysutils/u-boot-master/Makefile
index af5bcbb2d9d9..646876fdb261 100644
--- a/sysutils/u-boot-master/Makefile
+++ b/sysutils/u-boot-master/Makefile
@@ -118,7 +118,7 @@ UBOOT_PLIST_QEMU=	u-boot.bin
 .if !defined(UBOOT_VERSION) && defined(UBOOT_VERSION_${FAMILY:tu})
 UBOOT_VERSION=${UBOOT_VERSION_${FAMILY:tu}}
 .endif
-UBOOT_VERSION?=	2023.10
+UBOOT_VERSION?=	2024.01
 
 # If a slave port defines a PORTREVISION use it
 .if defined(U_BOOT_SLAVE_PORTREVISION_${UBOOT_VERSION})
diff --git a/sysutils/u-boot-master/distinfo b/sysutils/u-boot-master/distinfo
index f0978abb36ae..4b97d19f3295 100644
--- a/sysutils/u-boot-master/distinfo
+++ b/sysutils/u-boot-master/distinfo
@@ -1,25 +1,3 @@
-TIMESTAMP = 1702197339
-SHA256 (u-boot/u-boot-2023.10.tar.bz2) = e00e6c6f014e046101739d08d06f328811cebcf5ae101348f409cbbd55ce6900
-SIZE (u-boot/u-boot-2023.10.tar.bz2) = 19645392
-SHA256 (u-boot/1036621/raw) = 28dbd66d14fab9dc782ce091d3c132a226b8425f6503c329ee8a7031b79b52f7
-SIZE (u-boot/1036621/raw) = 480
-SHA256 (u-boot/1173473/raw) = 4f182d6f99b1d868237607200d64a1d8a2d57ea44fc25ca49bce929ad6457228
-SIZE (u-boot/1173473/raw) = 433
-SHA256 (u-boot/1172554/raw) = d1a39d7d6487cfb481392e7ea4f0bf0d209c08e0c3426c29d7eeaeb9b806cf42
-SIZE (u-boot/1172554/raw) = 640
-SHA256 (u-boot/1172555/raw) = 09d17a62fb6bc7c7ab73bfc7061fc5da2b5a32e7deb098c9f76aed8ff8991751
-SIZE (u-boot/1172555/raw) = 568
-SHA256 (u-boot/1665960/raw) = adcd5f5fb5be8e541a32815bf0070cea0a45706aed2d1bf571510b9eaf2ab532
-SIZE (u-boot/1665960/raw) = 923
-SHA256 (u-boot/1810050/raw) = b3f2394f4147ff379903b0d9386d7114fe05669500754eae8f771553f59a8f05
-SIZE (u-boot/1810050/raw) = 1196
-SHA256 (u-boot/1810051/raw) = 4cf7de022b896d1c83c26b001e20a389c3ea80b4f494767cc76925f47f77309b
-SIZE (u-boot/1810051/raw) = 1179
-SHA256 (u-boot/1810052/raw) = cf302f253a285c1eb3100e5caf30fcce813981eabb318d277ed6b34bc472e26f
-SIZE (u-boot/1810052/raw) = 973
-SHA256 (u-boot/1810053/raw) = b67fc8833e226a1a6279a098554f43465170805ce8db5a4074e4322c733dfc8e
-SIZE (u-boot/1810053/raw) = 1062
-SHA256 (u-boot/1810054/raw) = 21418aecaa879caaceaa6acdc07869f5407253bb4fa82044a9771a5222eb5958
-SIZE (u-boot/1810054/raw) = 468
-SHA256 (u-boot/1838641/raw) = 953924a8e1df590f64931a3a4b9b55422f2a2f97cd51a42d5caef2c5bb565c4f
-SIZE (u-boot/1838641/raw) = 2523
+TIMESTAMP = 1704888643
+SHA256 (u-boot/u-boot-2024.01.tar.bz2) = b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3
+SIZE (u-boot/u-boot-2024.01.tar.bz2) = 19926911
diff --git a/sysutils/u-boot-nanopi-r4s/Makefile b/sysutils/u-boot-nanopi-r4s/Makefile
index 8b2a1b85d1b5..ad4f32947328 100644
--- a/sysutils/u-boot-nanopi-r4s/Makefile
+++ b/sysutils/u-boot-nanopi-r4s/Makefile
@@ -1,13 +1,5 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
-U_BOOT_SLAVE_PORTREVISION_2023.10=	1
-
-PATCHFILES+=	1810050/raw \
-		1810051/raw \
-		1810052/raw \
-		1810053/raw \
-		1810054/raw
-
 MODEL=		nanopi-r4s
 BOARD_CONFIG=	nanopi-r4s-rk3399_defconfig
 FAMILY=		rk3399
diff --git a/sysutils/u-boot-rockpro64/Makefile b/sysutils/u-boot-rockpro64/Makefile
index 7ea08d009939..4a99f531d2cd 100644
--- a/sysutils/u-boot-rockpro64/Makefile
+++ b/sysutils/u-boot-rockpro64/Makefile
@@ -1,13 +1,6 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
-U_BOOT_SLAVE_PORTREVISION_2023.10=	1
-
 EXTRA_PATCHES=	${.CURDIR}/files/
-PATCHFILES+=	1810050/raw \
-		1810051/raw \
-		1810052/raw \
-		1810053/raw \
-		1810054/raw
 
 MODEL=		rockpro64
 BOARD_CONFIG=	rockpro64-rk3399_defconfig
diff --git a/sysutils/u-boot-rpi-0-w/Makefile b/sysutils/u-boot-rpi-0-w/Makefile
index a00d2ca8330d..125c9584ace2 100644
--- a/sysutils/u-boot-rpi-0-w/Makefile
+++ b/sysutils/u-boot-rpi-0-w/Makefile
@@ -1,9 +1,5 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
-U_BOOT_SLAVE_PORTREVISION_2023.10=	1
-
-PATCHFILES+=	1838641/raw
-
 MODEL=		rpi-0-w
 BOARD_CONFIG=	rpi_0_w_defconfig
 FAMILY=		rpi
diff --git a/sysutils/u-boot-rpi-arm64/Makefile b/sysutils/u-boot-rpi-arm64/Makefile
index 25c442df55bf..26be706afbae 100644
--- a/sysutils/u-boot-rpi-arm64/Makefile
+++ b/sysutils/u-boot-rpi-arm64/Makefile
@@ -1,9 +1,6 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
-U_BOOT_SLAVE_PORTREVISION_2023.10=	1
-
 EXTRA_PATCHES=	${.CURDIR}/files/
-PATCHFILES+=	1838641/raw
 
 MODEL=		rpi-arm64
 BOARD_CONFIG=	rpi_arm64_defconfig
diff --git a/sysutils/u-boot-rpi/Makefile b/sysutils/u-boot-rpi/Makefile
index 7958e0d84c99..c92c9c17963a 100644
--- a/sysutils/u-boot-rpi/Makefile
+++ b/sysutils/u-boot-rpi/Makefile
@@ -1,11 +1,7 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
-U_BOOT_SLAVE_PORTREVISION_2023.10=	1
-
 WWW=		https://wiki.freebsd.org/FreeBSD/arm/Raspberry%20Pi
 
-PATCHFILES+=	1838641/raw
-
 MODEL=		rpi
 BOARD_CONFIG=	rpi_defconfig
 FAMILY=		rpi
diff --git a/sysutils/u-boot-rpi2/Makefile b/sysutils/u-boot-rpi2/Makefile
index 46309bd46fc8..054ab962dd6e 100644
--- a/sysutils/u-boot-rpi2/Makefile
+++ b/sysutils/u-boot-rpi2/Makefile
@@ -1,11 +1,7 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
-U_BOOT_SLAVE_PORTREVISION_2023.10=	1
-
 WWW=		https://wiki.freebsd.org/FreeBSD/arm/Raspberry%20Pi
 
-PATCHFILES+=	1838641/raw
-
 MODEL=		rpi2
 BOARD_CONFIG=	rpi_2_defconfig
 FAMILY=		rpi
diff --git a/sysutils/u-boot-rpi3/Makefile b/sysutils/u-boot-rpi3/Makefile
index 58afe44225e8..0ba914341934 100644
--- a/sysutils/u-boot-rpi3/Makefile
+++ b/sysutils/u-boot-rpi3/Makefile
@@ -1,9 +1,6 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
-U_BOOT_SLAVE_PORTREVISION_2023.10=	1
-
 EXTRA_PATCHES?=	${.CURDIR}/files/
-PATCHFILES+=	1838641/raw
 
 MODEL?=		rpi3
 BOARD_CONFIG?=	rpi_3_defconfig
diff --git a/sysutils/u-boot-rpi4/Makefile b/sysutils/u-boot-rpi4/Makefile
index 6a65891a041f..cf50d7a125dd 100644
--- a/sysutils/u-boot-rpi4/Makefile
+++ b/sysutils/u-boot-rpi4/Makefile
@@ -1,9 +1,6 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
-U_BOOT_SLAVE_PORTREVISION_2023.10=	1
-
 EXTRA_PATCHES=	${.CURDIR}/files/
-PATCHFILES+=	1838641/raw
 
 MODEL=		rpi4
 BOARD_CONFIG=	rpi_4_defconfig
diff --git a/sysutils/u-boot-sifive-fu740/Makefile b/sysutils/u-boot-sifive-fu740/Makefile
index 6f5fc07ca8a3..3902e50d6394 100644
--- a/sysutils/u-boot-sifive-fu740/Makefile
+++ b/sysutils/u-boot-sifive-fu740/Makefile
@@ -1,7 +1,5 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
-U_BOOT_SLAVE_PORTREVISION_2023.01=	1
-
 MODEL=		sifive-fu740
 BOARD_CONFIG=	sifive_unmatched_defconfig
 FAMILY=		sifive