sysutils/u-boot-*: Update to 2021.04

19 files changed, 6 insertions, 64 deletions

diff --git a/sysutils/u-boot-a64-olinuxino/Makefile b/sysutils/u-boot-a64-olinuxino/Makefile
index e31c934650d3..5a47af4a4dfc 100644
--- a/sysutils/u-boot-a64-olinuxino/Makefile
+++ b/sysutils/u-boot-a64-olinuxino/Makefile
@@ -1,8 +1,6 @@
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
-U_BOOT_SLAVE_PORTREVISION_2020.10=	1
-
 MODEL=		a64-olinuxino
 BOARD_CONFIG=	a64-olinuxino_defconfig
 FAMILY=		allwinner64
diff --git a/sysutils/u-boot-beaglebone/Makefile b/sysutils/u-boot-beaglebone/Makefile
index 39ee5ed10b11..a1019f2827bb 100644
--- a/sysutils/u-boot-beaglebone/Makefile
+++ b/sysutils/u-boot-beaglebone/Makefile
@@ -5,8 +5,6 @@ MODEL=		beaglebone
 BOARD_CONFIG=	am335x_evm_defconfig
 FAMILY=		omap
 
-U_BOOT_SLAVE_PORTREVISION_2020.04=	1
-
 CONFIG_FRAGMENT=	${.CURDIR}/files/bbb_fragment
 FRAGMENT_NAME=		bbb_fragment
 
diff --git a/sysutils/u-boot-firefly-rk3399/Makefile b/sysutils/u-boot-firefly-rk3399/Makefile
index ad523b9cb8cf..f8c0eb422513 100644
--- a/sysutils/u-boot-firefly-rk3399/Makefile
+++ b/sysutils/u-boot-firefly-rk3399/Makefile
@@ -1,8 +1,6 @@
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
-U_BOOT_SLAVE_PORTREVISION_2020.10=	1
-
 MODEL=		firefly-rk3399
 BOARD_CONFIG=	firefly-rk3399_defconfig
 FAMILY=		rk3399
diff --git a/sysutils/u-boot-master/Makefile b/sysutils/u-boot-master/Makefile
index 6f042047402b..a0dce966861b 100644
--- a/sysutils/u-boot-master/Makefile
+++ b/sysutils/u-boot-master/Makefile
@@ -17,7 +17,8 @@ LICENSE=	GPLv2
 BUILD_DEPENDS+=	gsed:textproc/gsed \
 		swig:devel/swig \
 		dtc>=1.4.1:sysutils/dtc \
-		mkimage:sysutils/u-boot-tools
+		mkimage:sysutils/u-boot-tools \
+		${PYTHON_PKGNAMEPREFIX}setuptools-pkg>=0:devel/py-setuptools-pkg@${PY_FLAVOR}
 BUILD_DEPENDS+=	${COMPILER}:devel/${COMPILER}
 
 USES=		bison gmake python:3.7+,build shebangfix tar:bz2
@@ -110,7 +111,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?=	2020.10
+UBOOT_VERSION?=	2021.04
 
 # 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 13abaf267737..f5fe97e16a82 100644
--- a/sysutils/u-boot-master/distinfo
+++ b/sysutils/u-boot-master/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1602419610
-SHA256 (u-boot/u-boot-2020.10.tar.bz2) = 0d481bbdc05c0ee74908ec2f56a6daa53166cc6a78a0e4fac2ac5d025770a622
-SIZE (u-boot/u-boot-2020.10.tar.bz2) = 15784894
+TIMESTAMP = 1617718705
+SHA256 (u-boot/u-boot-2021.04.tar.bz2) = 0d438b1bb5cceb57a18ea2de4a0d51f7be5b05b98717df05938636e0aadfe11a
+SIZE (u-boot/u-boot-2021.04.tar.bz2) = 16673334
 SHA256 (u-boot/939129/raw) = 2a4ebf283aec8e74ec77b3cb071c6883f73807454ca94fea78361c7391187b97
 SIZE (u-boot/939129/raw) = 310
 SHA256 (u-boot/1036621/raw) = 28dbd66d14fab9dc782ce091d3c132a226b8425f6503c329ee8a7031b79b52f7
diff --git a/sysutils/u-boot-nanopi-a64/Makefile b/sysutils/u-boot-nanopi-a64/Makefile
index 7893e6a39ff7..94e4d3de5339 100644
--- a/sysutils/u-boot-nanopi-a64/Makefile
+++ b/sysutils/u-boot-nanopi-a64/Makefile
@@ -1,8 +1,6 @@
 
 MASTERDIR=     ${.CURDIR}/../u-boot-master
 
-U_BOOT_SLAVE_PORTREVISION_2020.10=	1
-
 MODEL=         nanopi_a64
 BOARD_CONFIG=  nanopi_a64_defconfig
 FAMILY=                allwinner64
diff --git a/sysutils/u-boot-nanopi-neo2/Makefile b/sysutils/u-boot-nanopi-neo2/Makefile
index b554db0be2ac..56d6b979772c 100644
--- a/sysutils/u-boot-nanopi-neo2/Makefile
+++ b/sysutils/u-boot-nanopi-neo2/Makefile
@@ -1,8 +1,6 @@
 
 MASTERDIR=     ${.CURDIR}/../u-boot-master
 
-U_BOOT_SLAVE_PORTREVISION_2020.10=	1
-
 MODEL=         nanopi-neo2
 BOARD_CONFIG=  nanopi_neo2_defconfig
 FAMILY=                allwinner64
diff --git a/sysutils/u-boot-orangepi-pc2/Makefile b/sysutils/u-boot-orangepi-pc2/Makefile
index 068861524dd6..8c0c0cc145b8 100644
--- a/sysutils/u-boot-orangepi-pc2/Makefile
+++ b/sysutils/u-boot-orangepi-pc2/Makefile
@@ -1,8 +1,6 @@
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
-U_BOOT_SLAVE_PORTREVISION_2020.10=	1
-
 MODEL=		orangepi-pc2
 BOARD_CONFIG=	orangepi_pc2_defconfig
 FAMILY=		allwinner64
diff --git a/sysutils/u-boot-pandaboard/Makefile b/sysutils/u-boot-pandaboard/Makefile
index ab7874518d60..b07c8d626d96 100644
--- a/sysutils/u-boot-pandaboard/Makefile
+++ b/sysutils/u-boot-pandaboard/Makefile
@@ -5,6 +5,4 @@ MODEL=		pandaboard
 BOARD_CONFIG=	omap4_panda_defconfig
 FAMILY=		omap
 
-BROKEN=		Does not build anymore
-
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-pine64-lts/Makefile b/sysutils/u-boot-pine64-lts/Makefile
index 4766cfa58cfd..694e304b3bc5 100644
--- a/sysutils/u-boot-pine64-lts/Makefile
+++ b/sysutils/u-boot-pine64-lts/Makefile
@@ -1,8 +1,6 @@
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
-U_BOOT_SLAVE_PORTREVISION_2020.10=	1
-
 MODEL=		pine64-lts
 BOARD_CONFIG=	pine64-lts_defconfig
 FAMILY=		allwinner64
diff --git a/sysutils/u-boot-pine64/Makefile b/sysutils/u-boot-pine64/Makefile
index 1b64bbe81bb0..c14cae1b5c11 100644
--- a/sysutils/u-boot-pine64/Makefile
+++ b/sysutils/u-boot-pine64/Makefile
@@ -1,8 +1,6 @@
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
-U_BOOT_SLAVE_PORTREVISION_2020.10=	1
-
 MODEL=		pine64
 BOARD_CONFIG=	pine64_plus_defconfig
 FAMILY=		allwinner64
diff --git a/sysutils/u-boot-pinebook/Makefile b/sysutils/u-boot-pinebook/Makefile
index 48098c44adaa..4e5b0723129e 100644
--- a/sysutils/u-boot-pinebook/Makefile
+++ b/sysutils/u-boot-pinebook/Makefile
@@ -1,8 +1,6 @@
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
-U_BOOT_SLAVE_PORTREVISION_2020.10=	1
-
 MODEL=		pinebook
 BOARD_CONFIG=	pinebook_defconfig
 FAMILY=		allwinner64
diff --git a/sysutils/u-boot-pinebookpro/Makefile b/sysutils/u-boot-pinebookpro/Makefile
index 5fb000540773..c74779823c9b 100644
--- a/sysutils/u-boot-pinebookpro/Makefile
+++ b/sysutils/u-boot-pinebookpro/Makefile
@@ -1,8 +1,6 @@
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
-U_BOOT_SLAVE_PORTREVISION_2020.10=	1
-
 MODEL=		pinebookpro
 BOARD_CONFIG=	pinebook-pro-rk3399_defconfig
 FAMILY=		rk3399
diff --git a/sysutils/u-boot-rock64/Makefile b/sysutils/u-boot-rock64/Makefile
index 958ce7102a06..ef591e295f3f 100644
--- a/sysutils/u-boot-rock64/Makefile
+++ b/sysutils/u-boot-rock64/Makefile
@@ -1,8 +1,6 @@
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
-U_BOOT_SLAVE_PORTREVISION_2020.10=	1
-
 MODEL=		rock64
 BOARD_CONFIG=	rock64-rk3328_defconfig
 FAMILY=		rk3328
diff --git a/sysutils/u-boot-rockpro64/Makefile b/sysutils/u-boot-rockpro64/Makefile
index 6dad429807a1..9d18e784f1ca 100644
--- a/sysutils/u-boot-rockpro64/Makefile
+++ b/sysutils/u-boot-rockpro64/Makefile
@@ -1,10 +1,6 @@
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
-U_BOOT_SLAVE_PORTREVISION_2020.10=	1
-
-EXTRA_PATCHES=	${.CURDIR}/files
-
 MODEL=		rockpro64
 BOARD_CONFIG=	rockpro64-rk3399_defconfig
 FAMILY=		rk3399
diff --git a/sysutils/u-boot-rockpro64/files/patch-arch_arm_dts_rk3399-u-boot.dtsi b/sysutils/u-boot-rockpro64/files/patch-arch_arm_dts_rk3399-u-boot.dtsi
deleted file mode 100644
index 80180b9ebf0e..000000000000
--- a/sysutils/u-boot-rockpro64/files/patch-arch_arm_dts_rk3399-u-boot.dtsi
+++ /dev/null
@@ -1,25 +0,0 @@
-From 84090d14ac93f67f2c11716912d3e352e3d9856d Mon Sep 17 00:00:00 2001
-From: Emmanuel Vadot <manu@FreeBSD.org>
-Date: Sun, 11 Oct 2020 17:22:45 +0200
-Subject: [PATCH 1/2] Remove spi1 alias, it breaks detecting flash on rockpro64
-Content-Type: text/plain; charset=UTF-8
-
----
- arch/arm/dts/rk3399-u-boot.dtsi | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi
-index ecd230c720..2d5e5d9900 100644
---- arch/arm/dts/rk3399-u-boot.dtsi
-+++ arch/arm/dts/rk3399-u-boot.dtsi
-@@ -11,7 +11,6 @@
- 		mmc0 = &sdhci;
- 		mmc1 = &sdmmc;
- 		pci0 = &pcie0;
--		spi1 = &spi1;
- 	};
- 
- 	cic: syscon@ff620000 {
--- 
-2.28.0
-
diff --git a/sysutils/u-boot-sifive-fu540/Makefile b/sysutils/u-boot-sifive-fu540/Makefile
index 72baef44ade1..0021dd379b17 100644
--- a/sysutils/u-boot-sifive-fu540/Makefile
+++ b/sysutils/u-boot-sifive-fu540/Makefile
@@ -1,8 +1,6 @@
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
-U_BOOT_SLAVE_PORTREVISION_2020.10=	1
-
 MODEL=		sifive-fu540
 BOARD_CONFIG=	sifive_fu540_defconfig
 FAMILY=		sifive
diff --git a/sysutils/u-boot-sopine-spi/Makefile b/sysutils/u-boot-sopine-spi/Makefile
index 1b0a361994ba..2f630db8b6f6 100644
--- a/sysutils/u-boot-sopine-spi/Makefile
+++ b/sysutils/u-boot-sopine-spi/Makefile
@@ -1,8 +1,6 @@
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
-U_BOOT_SLAVE_PORTREVISION_2020.10=	1
-
 MODEL=		sopine-spi
 BOARD_CONFIG=	sopine_baseboard_defconfig
 FAMILY=		allwinner64
diff --git a/sysutils/u-boot-sopine/Makefile b/sysutils/u-boot-sopine/Makefile
index 1a4f6ca54868..64ec7ec85daf 100644
--- a/sysutils/u-boot-sopine/Makefile
+++ b/sysutils/u-boot-sopine/Makefile
@@ -1,8 +1,6 @@
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
-U_BOOT_SLAVE_PORTREVISION_2020.10=	1
-
 MODEL=		sopine
 BOARD_CONFIG=	sopine_baseboard_defconfig
 FAMILY=		allwinner64