git: 4989d5bddfdb - main - sysutils/u-boot: Update to 2026.10

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Emmanuel Vadot <manu_at_FreeBSD.org>
Date: Wed, 21 Oct 2026 04:40:47 UTC
The branch main has been updated by manu:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4989d5bddfdb59602e87b1ce05d2a47791a28efa

commit 4989d5bddfdb59602e87b1ce05d2a47791a28efa
Author:     Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2026-10-20 20:42:38 +0000
Commit:     Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2026-10-21 04:39:57 +0000

    sysutils/u-boot: Update to 2026.10
    
    The project does not publish release tarballs on ftp.denx.de anymore, fetch
    newer releases from its GitLab instance.  Older slave ports can still pin a
    tarball release.
    
    Use the new rkbin blobs for the RK3568 and RK3588 boards.
    
    Mark u-boot-beaglebone as broken: am335x does not resolve SYS_LOAD_ADDR and
    TEXT_BASE through the kconfig merge and the build hangs.
---
 sysutils/u-boot-bananapi-r2-pro/Makefile |  2 --
 sysutils/u-boot-beaglebone/Makefile      |  4 ++++
 sysutils/u-boot-master/Makefile          | 34 +++++++++++++++++++++-----------
 sysutils/u-boot-master/distinfo          |  6 +++---
 sysutils/u-boot-nanopi-r5s/Makefile      |  2 --
 sysutils/u-boot-quartz64-a/Makefile      |  2 --
 sysutils/u-boot-quartz64-b/Makefile      |  2 --
 sysutils/u-boot-radxa-zero3/Makefile     |  2 --
 8 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/sysutils/u-boot-bananapi-r2-pro/Makefile b/sysutils/u-boot-bananapi-r2-pro/Makefile
index ce899b96d91a..0fc6d8ba525a 100644
--- a/sysutils/u-boot-bananapi-r2-pro/Makefile
+++ b/sysutils/u-boot-bananapi-r2-pro/Makefile
@@ -1,7 +1,5 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
-PORTREVISION=	1
-
 MODEL=		bananapi-r2-pro
 BOARD_CONFIG=	bpi-r2-pro-rk3568_defconfig
 FAMILY=		rk356X
diff --git a/sysutils/u-boot-beaglebone/Makefile b/sysutils/u-boot-beaglebone/Makefile
index b111e31c032f..1d44df876d7e 100644
--- a/sysutils/u-boot-beaglebone/Makefile
+++ b/sysutils/u-boot-beaglebone/Makefile
@@ -4,6 +4,10 @@ MODEL=		beaglebone
 BOARD_CONFIG=	am335x_evm_defconfig
 FAMILY=		omap
 
+# am335x kconfig does not resolve SYS_LOAD_ADDR and TEXT_BASE through the
+# merge_config.sh path in 2026.10, the build hangs prompting for them.
+BROKEN=		Does not build with u-boot 2026.10
+
 CONFIG_FRAGMENT=	${.CURDIR}/files/bbb_fragment
 FRAGMENT_NAME=		bbb_fragment
 
diff --git a/sysutils/u-boot-master/Makefile b/sysutils/u-boot-master/Makefile
index 57cd22fea4fd..41c33d3d8f65 100644
--- a/sysutils/u-boot-master/Makefile
+++ b/sysutils/u-boot-master/Makefile
@@ -6,8 +6,6 @@ PORTNAME=	u-boot
 PORTVERSION=	${UBOOT_VERSION}
 CATEGORIES=	sysutils
 PKGNAMESUFFIX?=	-${MODEL}
-MASTER_SITES=	https://ftp.denx.de/pub/u-boot/ \
-		ftp://ftp.denx.de/pub/u-boot/
 DIST_SUBDIR=	u-boot
 
 MAINTAINER?=	uboot@FreeBSD.org
@@ -29,8 +27,7 @@ BUILD_DEPENDS+=	${COMPILER}:devel/${COMPILER}
 BUILD_DEPENDS+=	gnutls>=0:security/gnutls
 LIB_DEPENDS+=	libuuid.so:misc/libuuid
 
-USES=		bison compiler:c11 gmake python:build perl5 pkgconfig shebangfix ssl \
-		tar:bz2
+USES=		bison compiler:c11 gmake python:build perl5 pkgconfig shebangfix ssl
 USE_PERL5=	build
 BINARY_ALIAS=	bison=${LOCALBASE}/bin/bison \
 		date=${LOCALBASE}/bin/gdate \
@@ -136,7 +133,22 @@ UBOOT_PLIST_QEMU=	u-boot.bin
 .if !defined(UBOOT_VERSION) && defined(UBOOT_VERSION_${FAMILY:tu})
 UBOOT_VERSION=${UBOOT_VERSION_${FAMILY:tu}}
 .endif
-UBOOT_VERSION?=	2026.07
+UBOOT_VERSION?=	2026.10
+
+# Releases up to 2026.07 are tarballs on ftp.denx.de.  The project does not
+# publish tarballs there anymore, fetch the tags of newer releases from its
+# GitLab instance.  Slave ports can still pin an older version.
+.if ${UBOOT_VERSION:C/[^0-9]//g} >= 202610
+USE_GITLAB=	yes
+GL_SITE=	https://git.u-boot-project.org
+GL_ACCOUNT=	u-boot
+GL_PROJECT=	u-boot
+GL_TAGNAME=	v${UBOOT_VERSION}
+.else
+MASTER_SITES=	https://ftp.denx.de/pub/u-boot/ \
+		ftp://ftp.denx.de/pub/u-boot/
+USES+=		tar:bz2
+.endif
 
 # If a slave port defines a PORTREVISION use it
 .if defined(U_BOOT_SLAVE_PORTREVISION_${UBOOT_VERSION})
@@ -200,17 +212,17 @@ MAKE_ENV+=	BL31=${LOCALBASE}/share/atf-rk3399/bl31.elf
 .endif
 
 .if defined(FAMILY) && ${FAMILY} == rk356X
-BUILD_DEPENDS+=	${LOCALBASE}/share/rkbin/rk35/rk3566_ddr_1056MHz_v1.23.bin:sysutils/rkbin \
+BUILD_DEPENDS+=	${LOCALBASE}/share/rkbin/rk35/rk3566_ddr_1056MHz_v1.26.bin:sysutils/rkbin \
 		${PYTHON_PKGNAMEPREFIX}pyelftools>0:devel/py-pyelftools@${PY_FLAVOR}
-MAKE_ENV+=	BL31=${LOCALBASE}/share/rkbin/rk35/rk3568_bl31_v1.45.elf \
-		ROCKCHIP_TPL=${LOCALBASE}/share/rkbin/rk35/rk3566_ddr_1056MHz_v1.23.bin
+MAKE_ENV+=	BL31=${LOCALBASE}/share/rkbin/rk35/rk3568_bl31_v1.46.elf \
+		ROCKCHIP_TPL=${LOCALBASE}/share/rkbin/rk35/rk3566_ddr_1056MHz_v1.26.bin
 .endif
 
 .if defined(FAMILY) && ${FAMILY} == rk3588
-BUILD_DEPENDS+=	${LOCALBASE}/share/rkbin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.18.bin:sysutils/rkbin \
+BUILD_DEPENDS+=	${LOCALBASE}/share/rkbin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.24.bin:sysutils/rkbin \
 		${PYTHON_PKGNAMEPREFIX}pyelftools>0:devel/py-pyelftools@${PY_FLAVOR}
-MAKE_ENV+=	BL31=${LOCALBASE}/share/rkbin/rk35/rk3588_bl31_v1.47.elf \
-		ROCKCHIP_TPL=${LOCALBASE}/share/rkbin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.18.bin
+MAKE_ENV+=	BL31=${LOCALBASE}/share/rkbin/rk35/rk3588_bl31_v1.56.elf \
+		ROCKCHIP_TPL=${LOCALBASE}/share/rkbin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.24.bin
 .endif
 
 # Each u-boot family has different files to include, bring them in.
diff --git a/sysutils/u-boot-master/distinfo b/sysutils/u-boot-master/distinfo
index 130d62b9611e..f6d7de4787ec 100644
--- a/sysutils/u-boot-master/distinfo
+++ b/sysutils/u-boot-master/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1787838860
+TIMESTAMP = 1792526665
 SHA256 (u-boot/u-boot-2024.10.tar.bz2) = b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0
 SIZE (u-boot/u-boot-2024.10.tar.bz2) = 26398495
 SHA256 (u-boot/u-boot-2024.07.tar.bz2) = f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f
 SIZE (u-boot/u-boot-2024.07.tar.bz2) = 26086110
-SHA256 (u-boot/u-boot-2026.07.tar.bz2) = 78e8bfc382fe388f9b55aa1daf8c563522a037779b5d4c349d1415e381f1243e
-SIZE (u-boot/u-boot-2026.07.tar.bz2) = 35029463
+SHA256 (u-boot/u-boot-v2026.10.tar.bz2) = 3f856da3cbbc93af51ff95fde18588a348b4a26723b01d9841e999d988481015
+SIZE (u-boot/u-boot-v2026.10.tar.bz2) = 35346177
diff --git a/sysutils/u-boot-nanopi-r5s/Makefile b/sysutils/u-boot-nanopi-r5s/Makefile
index 0a66e888578f..439f88fc5c37 100644
--- a/sysutils/u-boot-nanopi-r5s/Makefile
+++ b/sysutils/u-boot-nanopi-r5s/Makefile
@@ -1,7 +1,5 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
-PORTREVISION=	1
-
 MODEL=		nanopi-r5s
 BOARD_CONFIG=	nanopi-r5s-rk3568_defconfig
 FAMILY=		rk356X
diff --git a/sysutils/u-boot-quartz64-a/Makefile b/sysutils/u-boot-quartz64-a/Makefile
index b5b0d5c70978..208616aaf473 100644
--- a/sysutils/u-boot-quartz64-a/Makefile
+++ b/sysutils/u-boot-quartz64-a/Makefile
@@ -1,7 +1,5 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
-PORTREVISION=	1
-
 MODEL=		quartz64-a
 BOARD_CONFIG=	quartz64-a-rk3566_defconfig
 FAMILY=		rk356X
diff --git a/sysutils/u-boot-quartz64-b/Makefile b/sysutils/u-boot-quartz64-b/Makefile
index bc369c0bcca8..68b3b5b20213 100644
--- a/sysutils/u-boot-quartz64-b/Makefile
+++ b/sysutils/u-boot-quartz64-b/Makefile
@@ -1,7 +1,5 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
-PORTREVISION=	1
-
 MODEL=		quartz64-b
 BOARD_CONFIG=	quartz64-b-rk3566_defconfig
 FAMILY=		rk356X
diff --git a/sysutils/u-boot-radxa-zero3/Makefile b/sysutils/u-boot-radxa-zero3/Makefile
index cb92a93e8b24..11181e89bd9f 100644
--- a/sysutils/u-boot-radxa-zero3/Makefile
+++ b/sysutils/u-boot-radxa-zero3/Makefile
@@ -1,7 +1,5 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
-PORTREVISION=	1
-
 MODEL=		radxa-zero3
 BOARD_CONFIG=	radxa-zero-3-rk3566_defconfig
 FAMILY=		rk356X