Index: head/sysutils/u-boot-duovero/Makefile
===================================================================
--- head/sysutils/u-boot-duovero/Makefile	(revision 532702)
+++ head/sysutils/u-boot-duovero/Makefile	(revision 532703)
@@ -1,9 +1,11 @@
 # $FreeBSD$
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		duovero
 BOARD_CONFIG=	duovero_defconfig
 FAMILY=		omap
 
+BROKEN=		Does not build anymore
+
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-master/Makefile
===================================================================
--- head/sysutils/u-boot-master/Makefile	(revision 532702)
+++ head/sysutils/u-boot-master/Makefile	(revision 532703)
@@ -1,236 +1,236 @@
 # $FreeBSD$
 #
 # Common infrastructure for u-boot ports
 #
 
 PORTNAME=	u-boot
 PORTVERSION=	${UBOOT_VERSION}
 CATEGORIES=	sysutils
 PKGNAMESUFFIX?=	-${MODEL}
 MASTER_SITES=	ftp://ftp.denx.de/pub/u-boot/
 DIST_SUBDIR=	u-boot
 
 MAINTAINER?=	uboot@FreeBSD.org
 COMMENT=	Cross-build das u-boot for model ${MODEL}
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS+=	gsed:textproc/gsed \
 		swig3.0:devel/swig30 \
 		dtc>=1.4.1:sysutils/dtc \
 		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
 UBOOT_DIR=	share/u-boot/${PORTNAME}${PKGNAMESUFFIX}
 INST=		${PREFIX}/${UBOOT_DIR}
 DESCR?=		${.CURDIR}/pkg-descr
 
 MAKE_ARGS+=	V=1 CROSS_COMPILE=${CROSS_COMPILE} PYTHON=${PYTHON_CMD} ${ARCHFLAGS}
 
 NO_ARCH=	yes
 
 # Use upstreamed patches not yet mainlined
 PATCH_DIST_STRIP=	-p1
 PATCH_SITES+=	https://patchwork.ozlabs.org/patch/
 
 # Sanity checks
 .if !defined(MODEL) && !defined(BOARD_CONFIG) && !defined(FAMILY)
 MODEL=		NONE
 IGNORE=		is a metaport; there is nothing to build
 .else
 .if !defined(MODEL)
 IGNORE+=	MODEL is not defined
 .endif
 .if !defined(BOARD_CONFIG)
 IGNORE+=	BOARD_CONFIG is not defined
 .endif
 .if !defined(FAMILY)
 IGNORE+=	FAMILY is not defined
 .endif
 .endif
 
 # Overrides for OMAP family
 UBOOT_PLIST_OMAP=u-boot.img MLO
 UBOOT_METADATA_OMAP_FILES=	${UBOOT_PLIST_OMAP}
 UBOOT_METADATA_OMAP_METHOD=	file
 
 # Overrides for ALLWINNER family
 UBOOT_PLIST_ALLWINNER=u-boot-sunxi-with-spl.bin
 UBOOT_METADATA_ALLWINNER_FILES=		${UBOOT_PLIST_ALLWINNER}
 UBOOT_METADATA_ALLWINNER_METHOD=	raw
 UBOOT_METADATA_ALLWINNER_RAW_OFFSET=	8
 UBOOT_METADATA_ALLWINNER_RAW_BS=	1k
 
 # Overrides for ALLWINNER64 family
 UBOOT_PLIST_ALLWINNER64=${UBOOT_PLIST_ALLWINNER}
 UBOOT_ARCH_ALLWINNER64=aarch64
 UBOOT_METADATA_ALLWINNER64_FILES=	${UBOOT_PLIST_ALLWINNER64}
 UBOOT_METADATA_ALLWINNER64_METHOD=	raw
 UBOOT_METADATA_ALLWINNER64_RAW_OFFSET=	8
 UBOOT_METADATA_ALLWINNER64_RAW_BS=	1k
 
 # Overrides for Zynq 7000 family
 UBOOT_PLIST_ZYNQ_7000=u-boot.img boot.bin uEnv.txt
 UBOOT_MOVE_ZYNQ_7000=${WRKSRC}/spl/boot.bin ${.CURDIR}/files/uEnv.txt
 
 # Overrides for RPI family
 UBOOT_PLIST_RPI=	u-boot.bin
 UBOOT_METADATA_RPI_FILES=	${UBOOT_PLIST_RPI}
 UBOOT_METADATA_RPI_METHOD=	file
 
 # Overrides for IMX6 family
 UBOOT_METADATA_IMX6_FILES=	u-boot.imx
 UBOOT_METADATA_IMX6_METHOD=	raw
 UBOOT_METADATA_IMX6_RAW_OFFSET=	2
 UBOOT_METADATA_IMX6_RAW_BS=	512
 
 # Override for RK3328 family
 UBOOT_PLIST_RK3328=	idbloader.img u-boot.itb
 UBOOT_ARCH_RK3328=	aarch64
 
 # Override for RK3399 family
 UBOOT_PLIST_RK3399=	idbloader.img u-boot.itb
 UBOOT_ARCH_RK3399=	aarch64
 
 # Override for ARMADA38X family
 UBOOT_PLIST_ARMADA38X=	u-boot-spl.kwb
 UBOOT_METADATA_ARMADA38X_FILES=		${UBOOT_PLIST_ARMADA38X}
 UBOOT_METADATA_ARMADA38X_METHOD=	raw
 UBOOT_METADATA_ARMADA38X_RAW_OFFSET=	1
 UBOOT_METADATA_ARMADA38X_RAW_BS=	512
 
 # Uboot variables
 .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})
 PORTREVISION=	${U_BOOT_SLAVE_PORTREVISION_${UBOOT_VERSION}}
 .endif
 
 .if !defined(UBOOT_PLIST) && defined(UBOOT_PLIST_${FAMILY:tu})
 UBOOT_PLIST=${UBOOT_PLIST_${FAMILY:tu}}
 .endif
 UBOOT_PLIST?=u-boot.img
 
 .if !defined(UBOOT_ARCH) && defined(UBOOT_ARCH_${FAMILY:tu})
 UBOOT_ARCH=${UBOOT_ARCH_${FAMILY:tu}}
 .endif
 UBOOT_ARCH?=	arm
 
 .if ${UBOOT_ARCH} == arm
 CROSS_COMPILE=arm-none-eabi-
 ARCHFLAGS=ARCH=${UBOOT_ARCH}
 UBOOT_PLIST+=	boot.scr
 .elif ${UBOOT_ARCH} == aarch64
 CROSS_COMPILE=aarch64-none-elf-
 ARCHFLAGS=ARCH=arm
 .else
 # Best guess for other architectures
 CROSS_COMPILE=${UBOOT_ARCH}-none-elf-
 ARCHFLAGS=ARCH=${UBOOT_ARCH}
 .endif
 COMPILER?=${CROSS_COMPILE}gcc
 
 .if !defined(UBOOT_MOVE) && defined(UBOOT_MOVE_${FAMILY:tu})
 UBOOT_MOVE=${UBOOT_MOVE_${FAMILY:tu}}
 .endif
 
 # Per family dependancies
 .if defined(FAMILY) && ${FAMILY} == allwinner64
 BUILD_DEPENDS+=	${LOCALBASE}/share/atf-sun50i_a64/bl31.bin:sysutils/atf-sun50i_a64
 MAKE_ENV+=	BL31=${LOCALBASE}/share/atf-sun50i_a64/bl31.bin
 .endif
 
 .if defined(FAMILY) && ${FAMILY} == rk3328
 BUILD_DEPENDS+=	${LOCALBASE}/share/atf-rk3328/bl31.elf:sysutils/atf-rk3328 \
 		${PYTHON_PKGNAMEPREFIX}pyelftools>0:devel/py-pyelftools@${PY_FLAVOR}
 MAKE_ENV+=	BL31=${LOCALBASE}/share/atf-rk3328/bl31.elf
 .endif
 
 .if defined(FAMILY) && ${FAMILY} == rk3399
 BUILD_DEPENDS+=	${LOCALBASE}/share/atf-rk3399/bl31.elf:sysutils/atf-rk3399 \
 		${PYTHON_PKGNAMEPREFIX}pyelftools>0:devel/py-pyelftools@${PY_FLAVOR}
 MAKE_ENV+=	BL31=${LOCALBASE}/share/atf-rk3399/bl31.elf
 .endif
 
 # Each u-boot family has different files to include, bring them in.
 .for i in ${UBOOT_PLIST}
 PLIST_FILES+=	${UBOOT_DIR}/${i}
 .endfor
 PLIST_FILES+=	${UBOOT_DIR}/README
 
 .if defined(UBOOT_METADATA_${FAMILY:tu}_METHOD)
 METADATA_METHOD=${UBOOT_METADATA_${FAMILY:tu}_METHOD}
 METADATA_FILES=${UBOOT_METADATA_${FAMILY:tu}_FILES}
 PLIST_FILES+=	${UBOOT_DIR}/metadata
 UBOOT_PLIST+=	metadata
 .if ${METADATA_METHOD} == "raw"
 METADATA_OFFSET=${UBOOT_METADATA_${FAMILY:tu}_RAW_OFFSET}
 METADATA_BS=${UBOOT_METADATA_${FAMILY:tu}_RAW_BS}
 .elif ${METADATA_METHOD} == "file"
 .else
 .error "Unsupported METADATA_METHOD"
 .endif
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|make|${MAKE_CMD}|" ${WRKSRC}/scripts/kconfig/merge_config.sh
 	${CP} ${FILESDIR}/boot.cmd ${WRKSRC}/
 .if defined(METADATA_METHOD)
 	@echo "METHOD=uboot-${METADATA_METHOD}" > ${WRKSRC}/metadata
 	@echo "FILES=\"${METADATA_FILES}\"" >> ${WRKSRC}/metadata
 .if ${METADATA_METHOD} == "raw"
 	@echo "OFFSET=${METADATA_OFFSET}" >> ${WRKSRC}/metadata
 	@echo "BS=${METADATA_BS}" >> ${WRKSRC}/metadata
 .elif ${METADATA_METHOD} == "file"
 .endif
 .endif
 
 .if ${UBOOT_ARCH} == arm && !defined(CONFIG_FRAGMENT)
 # For armv6/v7 we want CONFIG_API
 # Use a KConfig fragment for that
 FRAGMENT_NAME=		FreeBSD_Fragment
 CONFIG_FRAGMENT=	${FILESDIR}/${FRAGMENT_NAME}
 .endif
 
 .if defined(CONFIG_FRAGMENT)
 do-configure:
 	${CP} ${CONFIG_FRAGMENT} ${WRKSRC}/configs/
 	(cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} scripts/kconfig/merge_config.sh configs/${BOARD_CONFIG} configs/${FRAGMENT_NAME})
 .else
 do-configure:
 	(cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${MAKE_CMD} ${BOARD_CONFIG})
 .endif
 
 post-build:
 .if ${UBOOT_ARCH} == arm
 	mkimage -C none -A arm -T script -d ${FILESDIR}/boot.cmd ${WRKSRC}/boot.scr
 .endif
 .if defined(UBOOT_EXTRA_TARGETS)
 .for i in ${UBOOT_EXTRA_TARGETS}
 	(cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${i})
 .endfor
 .endif
 # If we need to put anything into WRKSRC, do so now so we can build the PLIST
 # in do-install
 .if defined(UBOOT_MOVE)
 pre-install:
 	${CP} ${UBOOT_MOVE} ${WRKSRC}
 .endif
 
 do-install:
 	${MKDIR} ${STAGEDIR}/${INST}
 .for i in ${UBOOT_PLIST}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}/${INST}
 .endfor
 	${INSTALL_DATA} ${DESCR} ${STAGEDIR}/${INST}/README
 
 .include <bsd.port.mk>
Index: head/sysutils/u-boot-master/distinfo
===================================================================
--- head/sysutils/u-boot-master/distinfo	(revision 532702)
+++ head/sysutils/u-boot-master/distinfo	(revision 532703)
@@ -1,29 +1,29 @@
-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
 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/1137331/raw) = b6dec0334194ec87528aa01219dc5ecd60a3945c126704274933aab9ef112d38
 SIZE (u-boot/1137331/raw) = 2250
 SHA256 (u-boot/1137330/raw) = 6e111ee87ee2082a43b4cd929b74279e8cb63525a89ccab00255200a9cd03e2b
 SIZE (u-boot/1137330/raw) = 1548
 SHA256 (u-boot/1189494/raw) = 2f237d1e80c216fc3898381469b2af9d5639b60cb3128a11c8a23a0a12e4b80c
 SIZE (u-boot/1189494/raw) = 965
 SHA256 (u-boot/1189493/raw) = 4dba3366147813150e68a0aa9fa1738977cba45f9a55faf0fd0cdb3478142683
 SIZE (u-boot/1189493/raw) = 5959
 SHA256 (u-boot/1189497/raw) = 3c433ddf46b8c64f56a9699aeead85954d922e5fcfad52a7bfddf57e6cbdccb6
 SIZE (u-boot/1189497/raw) = 2241
 SHA256 (u-boot/1189495/raw) = ad1233a1da6171b83936e422c67467a54559364cc426d6804d20d425949a933d
 SIZE (u-boot/1189495/raw) = 3918
 SHA256 (u-boot/1245351/raw) = 02cec0ca1934ba64d010ec7f0453faa127b19aaae679d6bd9b946a3653837434
 SIZE (u-boot/1245351/raw) = 707
 SHA256 (u-boot/1245352/raw) = a4f48937cd9403b7f7708ba1fc5b9405da97bdedff25fdeb198ab613294e7d45
 SIZE (u-boot/1245352/raw) = 465
Index: head/sysutils/u-boot-pandaboard/Makefile
===================================================================
--- head/sysutils/u-boot-pandaboard/Makefile	(revision 532702)
+++ head/sysutils/u-boot-pandaboard/Makefile	(revision 532703)
@@ -1,9 +1,11 @@
 # $FreeBSD$
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		pandaboard
 BOARD_CONFIG=	omap4_panda_defconfig
 FAMILY=		omap
 
+BROKEN=		Does not build anymore
+
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-rock64/Makefile
===================================================================
--- head/sysutils/u-boot-rock64/Makefile	(revision 532702)
+++ head/sysutils/u-boot-rock64/Makefile	(revision 532703)
@@ -1,17 +1,11 @@
 # $FreeBSD$
 
 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
 
 UBOOT_EXTRA_TARGETS=	u-boot.itb
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-rpi3/Makefile
===================================================================
--- head/sysutils/u-boot-rpi3/Makefile	(revision 532702)
+++ head/sysutils/u-boot-rpi3/Makefile	(revision 532703)
@@ -1,22 +1,20 @@
 # $FreeBSD$
 
 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.
 PATCHFILES+=	1245351/raw 1245352/raw
 
 MODEL=		rpi3
 BOARD_CONFIG=	rpi_3_defconfig
 FAMILY=		rpi
 UBOOT_ARCH=	aarch64
 
 DEPENDS=	${LOCALBASE}/share/rpi-firmware/bootcode.bin:sysutils/rpi-firmware
 
 CONFIG_FRAGMENT=	${.CURDIR}/files/rpi3_fragment
 FRAGMENT_NAME=	rpi3_fragment
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-rpi4/Makefile
===================================================================
--- head/sysutils/u-boot-rpi4/Makefile	(revision 532702)
+++ head/sysutils/u-boot-rpi4/Makefile	(revision 532703)
@@ -1,26 +1,24 @@
 # $FreeBSD$
 
 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
 PATCHFILES+=	1137331/raw 1137330/raw
 # Fix memory bank issues
 PATCHFILES+=	1189494/raw 1189493/raw 1189497/raw 1189495/raw
 # Allow variable reservation of lowest pages for increased PSCI stub size.
 PATCHFILES+=	1245351/raw 1245352/raw
 
 MODEL=		rpi4
 BOARD_CONFIG=	rpi_4_defconfig
 FAMILY=		rpi
 UBOOT_ARCH=	aarch64
 
 DEPENDS=	${LOCALBASE}/share/rpi-firmware/bootcode.bin:sysutils/rpi-firmware
 
 CONFIG_FRAGMENT=	${.CURDIR}/files/rpi4_fragment
 FRAGMENT_NAME=	rpi4_fragment
 
 .include "${MASTERDIR}/Makefile"