diff --git a/sysutils/u-boot-duovero/Makefile b/sysutils/u-boot-duovero/Makefile
index 0f84345cd11b..692f14321e37 100644
--- a/sysutils/u-boot-duovero/Makefile
+++ b/sysutils/u-boot-duovero/Makefile
@@ -6,4 +6,6 @@ MODEL=		duovero
 BOARD_CONFIG=	duovero_defconfig
 FAMILY=		omap
 
+BROKEN=		Does not build anymore
+
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-master/Makefile b/sysutils/u-boot-master/Makefile
index 06466ca1de1a..4f8b0a9127ab 100644
--- a/sysutils/u-boot-master/Makefile
+++ b/sysutils/u-boot-master/Makefile
@@ -21,8 +21,8 @@ BUILD_DEPENDS+=	gsed:textproc/gsed \
 		mkimage:sysutils/u-boot-tools
 BUILD_DEPENDS+=	${COMPILER}:devel/${COMPILER}
 
-USES=		bison gmake python:2.7,build shebangfix tar:bz2
-BINARY_ALIAS=	bison=${LOCALBASE}/bin/bison dtc=${LOCALBASE}/bin/dtc sed=gsed swig=swig3.0 python2=python2.7
+USES=		bison gmake python:3.7,build shebangfix tar:bz2
+BINARY_ALIAS=	bison=${LOCALBASE}/bin/bison dtc=${LOCALBASE}/bin/dtc sed=gsed swig=swig3.0 python3=python3.7
 
 SHEBANG_FILES=	tools/binman/binman.py arch/arm/mach-rockchip/make_fit_atf.py
 SSP_UNSAFE=	yes
@@ -108,7 +108,7 @@ UBOOT_METADATA_ARMADA38X_RAW_BS=	512
 .if !defined(UBOOT_VERSION) && defined(UBOOT_VERSION_${FAMILY:tu})
 UBOOT_VERSION=${UBOOT_VERSION_${FAMILY:tu}}
 .endif
-UBOOT_VERSION?=	2019.10
+UBOOT_VERSION?=	2020.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 04ddabc5f4ba..6502ac1e8d78 100644
--- a/sysutils/u-boot-master/distinfo
+++ b/sysutils/u-boot-master/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1584323217
-SHA256 (u-boot/u-boot-2019.10.tar.bz2) = 8d6d6070739522dd236cba7055b8736bfe92b4fac0ea18ad809829ca79667014
-SIZE (u-boot/u-boot-2019.10.tar.bz2) = 14214608
+TIMESTAMP = 1586872320
+SHA256 (u-boot/u-boot-2020.04.tar.bz2) = fe732aaf037d9cc3c0909bad8362af366ae964bbdac6913a34081ff4ad565372
+SIZE (u-boot/u-boot-2020.04.tar.bz2) = 15065656
 SHA256 (u-boot/939129/raw) = 2a4ebf283aec8e74ec77b3cb071c6883f73807454ca94fea78361c7391187b97
 SIZE (u-boot/939129/raw) = 310
 SHA256 (u-boot/1036621/raw) = 28dbd66d14fab9dc782ce091d3c132a226b8425f6503c329ee8a7031b79b52f7
diff --git a/sysutils/u-boot-pandaboard/Makefile b/sysutils/u-boot-pandaboard/Makefile
index 0d628a1e701c..f333d408ad6c 100644
--- a/sysutils/u-boot-pandaboard/Makefile
+++ b/sysutils/u-boot-pandaboard/Makefile
@@ -6,4 +6,6 @@ MODEL=		pandaboard
 BOARD_CONFIG=	omap4_panda_defconfig
 FAMILY=		omap
 
+BROKEN=		Does not build anymore
+
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-rock64/Makefile b/sysutils/u-boot-rock64/Makefile
index d3f2a3954568..f62058e154f3 100644
--- a/sysutils/u-boot-rock64/Makefile
+++ b/sysutils/u-boot-rock64/Makefile
@@ -2,12 +2,6 @@
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
-U_BOOT_SLAVE_PORTREVISION_2019.10=	1
-
-PATCHFILES+=	1173473/raw \
-		1172554/raw \
-		1172555/raw
-
 MODEL=		rock64
 BOARD_CONFIG=	rock64-rk3328_defconfig
 FAMILY=		rk3328
diff --git a/sysutils/u-boot-rpi3/Makefile b/sysutils/u-boot-rpi3/Makefile
index 1fae2cd36d1a..742609bd4a7c 100644
--- a/sysutils/u-boot-rpi3/Makefile
+++ b/sysutils/u-boot-rpi3/Makefile
@@ -2,8 +2,6 @@
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
-U_BOOT_SLAVE_PORTREVISION_2019.10=	1
-
 EXTRA_PATCHES=	${.CURDIR}/files/
 PATCHFILES+=	939129/raw
 # Allow variable reservation of lowest pages for increased PSCI stub size.
diff --git a/sysutils/u-boot-rpi4/Makefile b/sysutils/u-boot-rpi4/Makefile
index 58583630e7f3..14c91734dd82 100644
--- a/sysutils/u-boot-rpi4/Makefile
+++ b/sysutils/u-boot-rpi4/Makefile
@@ -2,8 +2,6 @@
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
-U_BOOT_SLAVE_PORTREVISION_2019.10=	1
-
 EXTRA_PATCHES=	${.CURDIR}/files/
 PATCHFILES+=	939129/raw
 # Updated libfdt, pre-req to the next set