diff --git a/sysutils/u-boot-a13-olinuxino/Makefile b/sysutils/u-boot-a13-olinuxino/Makefile
index 407d6922f606..347d9973e6ac 100644
--- a/sysutils/u-boot-a13-olinuxino/Makefile
+++ b/sysutils/u-boot-a13-olinuxino/Makefile
@@ -1,7 +1,9 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		a13-olinuxino
 BOARD_CONFIG=	A13-OLinuXino_defconfig
 FAMILY=		allwinner
 
+U_BOOT_SLAVE_PORTREVISION_2021.04=	1
+
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-bananapi/Makefile b/sysutils/u-boot-bananapi/Makefile
index 9ee34393b078..2da2a6222521 100644
--- a/sysutils/u-boot-bananapi/Makefile
+++ b/sysutils/u-boot-bananapi/Makefile
@@ -1,7 +1,9 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		bananapi
 BOARD_CONFIG=	Bananapi_defconfig
 FAMILY=		allwinner
 
+U_BOOT_SLAVE_PORTREVISION_2021.04=	1
+
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-bananapim2/Makefile b/sysutils/u-boot-bananapim2/Makefile
index 5baa88ee439e..a8c40f5f0aa1 100644
--- a/sysutils/u-boot-bananapim2/Makefile
+++ b/sysutils/u-boot-bananapim2/Makefile
@@ -1,7 +1,9 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		bananapim2
 BOARD_CONFIG=	Sinovoip_BPI_M2_defconfig
 FAMILY=		allwinner
 
+U_BOOT_SLAVE_PORTREVISION_2021.04=	1
+
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-beaglebone/Makefile b/sysutils/u-boot-beaglebone/Makefile
index b111e31c032f..961ebd05d74e 100644
--- a/sysutils/u-boot-beaglebone/Makefile
+++ b/sysutils/u-boot-beaglebone/Makefile
@@ -1,10 +1,12 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		beaglebone
 BOARD_CONFIG=	am335x_evm_defconfig
 FAMILY=		omap
 
+U_BOOT_SLAVE_PORTREVISION_2021.04=	1
+
 CONFIG_FRAGMENT=	${.CURDIR}/files/bbb_fragment
 FRAGMENT_NAME=		bbb_fragment
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-chip/Makefile b/sysutils/u-boot-chip/Makefile
index fce52137940c..13264127a450 100644
--- a/sysutils/u-boot-chip/Makefile
+++ b/sysutils/u-boot-chip/Makefile
@@ -1,7 +1,9 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		chip
 BOARD_CONFIG=	CHIP_defconfig
 FAMILY=		allwinner
 
+U_BOOT_SLAVE_PORTREVISION_2021.04=	1
+
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-clearfog/Makefile b/sysutils/u-boot-clearfog/Makefile
index c7fa674db0a1..def7fdb1ea23 100644
--- a/sysutils/u-boot-clearfog/Makefile
+++ b/sysutils/u-boot-clearfog/Makefile
@@ -1,7 +1,9 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		clearfog
 BOARD_CONFIG=	clearfog_defconfig
 FAMILY=		armada38x
 
+U_BOOT_SLAVE_PORTREVISION_2021.04=	1
+
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-cubieboard/Makefile b/sysutils/u-boot-cubieboard/Makefile
index 2cd8f57252da..198f0b12cb35 100644
--- a/sysutils/u-boot-cubieboard/Makefile
+++ b/sysutils/u-boot-cubieboard/Makefile
@@ -1,7 +1,9 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		cubieboard
 BOARD_CONFIG=	Cubieboard_defconfig
 FAMILY=		allwinner
 
+U_BOOT_SLAVE_PORTREVISION_2021.04=	1
+
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-cubieboard2/Makefile b/sysutils/u-boot-cubieboard2/Makefile
index 99a4e7aee710..7e28f5ef6402 100644
--- a/sysutils/u-boot-cubieboard2/Makefile
+++ b/sysutils/u-boot-cubieboard2/Makefile
@@ -1,7 +1,9 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		cubieboard2
 BOARD_CONFIG=	Cubieboard2_defconfig
 FAMILY=		allwinner
 
+U_BOOT_SLAVE_PORTREVISION_2021.04=	1
+
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-cubox-hummingboard/Makefile b/sysutils/u-boot-cubox-hummingboard/Makefile
index 45c14eb898fe..f455968f7660 100644
--- a/sysutils/u-boot-cubox-hummingboard/Makefile
+++ b/sysutils/u-boot-cubox-hummingboard/Makefile
@@ -1,15 +1,17 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		cubox-hummingboard
 BOARD_CONFIG=	mx6cuboxi_defconfig
 FAMILY=		imx6
 
+U_BOOT_SLAVE_PORTREVISION_2021.04=	1
+
 IMXFILE=	u-boot.imx
 UBOOT_PLIST=	${IMXFILE}
 
 ALL_TARGET=	u-boot-with-spl.imx
 
 pre-install: .PHONY
 	@${CP} ${WRKSRC}/u-boot-with-spl.imx ${WRKSRC}/${IMXFILE}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-duovero/Makefile b/sysutils/u-boot-duovero/Makefile
index 13cca8bd532e..c4f5a26bf5ec 100644
--- a/sysutils/u-boot-duovero/Makefile
+++ b/sysutils/u-boot-duovero/Makefile
@@ -1,9 +1,11 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		duovero
 BOARD_CONFIG=	duovero_defconfig
 FAMILY=		omap
 
+U_BOOT_SLAVE_PORTREVISION_2021.04=	1
+
 BROKEN=		Does not build anymore
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-master/Makefile b/sysutils/u-boot-master/Makefile
index a0dce966861b..38fd6f081fbd 100644
--- a/sysutils/u-boot-master/Makefile
+++ b/sysutils/u-boot-master/Makefile
@@ -1,255 +1,250 @@
 #
 # 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 \
 		swig:devel/swig \
 		dtc>=1.4.1:sysutils/dtc \
 		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
 BINARY_ALIAS=	bison=${LOCALBASE}/bin/bison dtc=${LOCALBASE}/bin/dtc sed=gsed python3=${PYTHON_CMD}
 
 SHEBANG_FILES=	tools/binman/binman 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=	1
 UBOOT_METADATA_ALLWINNER64_RAW_BS=	128k
 
 # 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
 
 # Override for QEMU family
 UBOOT_PLIST_QEMU=	u-boot.bin
 
 # Uboot variables
 .if !defined(UBOOT_VERSION) && defined(UBOOT_VERSION_${FAMILY:tu})
 UBOOT_VERSION=${UBOOT_VERSION_${FAMILY:tu}}
 .endif
 UBOOT_VERSION?=	2021.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
 .elif ${UBOOT_ARCH} == riscv64
 CROSS_COMPILE=riscv64-none-elf-
 ARCHFLAGS=ARCH=riscv
 .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
 .if defined(SUBFAMILY) && ${SUBFAMILY} == h6
 BUILD_DEPENDS+=	${LOCALBASE}/share/atf-sun50i_h6/bl31.bin:sysutils/atf-sun50i_h6
 MAKE_ENV+=	BL31=${LOCALBASE}/share/atf-sun50i_h6/bl31.bin
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/share/atf-sun50i_a64/bl31.bin:sysutils/atf-sun50i_a64
 MAKE_ENV+=	BL31=${LOCALBASE}/share/atf-sun50i_a64/bl31.bin
 .endif
 .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(PLIST_EXTRAS)
 .for i in ${PLIST_EXTRAS}
 PLIST_FILES+=	${UBOOT_DIR}/${i}
 .endfor
 .endif
 
 .if !defined(NO_METADATA)
 .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
 .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
+# For armv6/v7 we want do disable secure mode and cache cleaning
 # 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>
diff --git a/sysutils/u-boot-master/files/FreeBSD_Fragment b/sysutils/u-boot-master/files/FreeBSD_Fragment
index 630d295cc8f1..f3837a932e98 100644
--- a/sysutils/u-boot-master/files/FreeBSD_Fragment
+++ b/sysutils/u-boot-master/files/FreeBSD_Fragment
@@ -1,3 +1,2 @@
-CONFIG_API=y
 CONFIG_ARMV7_NONSEC=n
-CONFIG_CMD_CACHE=y
+CONFIG_EFI_GRUB_ARM32_WORKAROUND=y
diff --git a/sysutils/u-boot-master/files/boot.cmd b/sysutils/u-boot-master/files/boot.cmd
deleted file mode 100644
index b3ce82975eb3..000000000000
--- a/sysutils/u-boot-master/files/boot.cmd
+++ /dev/null
@@ -1,2 +0,0 @@
-fatload ${devtype} ${devnum}:${distro_bootpart} ${kernel_addr_r} ubldr.bin && go ${kernel_addr_r}
-echo "Cannot load ubldr.bin"
diff --git a/sysutils/u-boot-master/files/patch-api_api.c b/sysutils/u-boot-master/files/patch-api_api.c
deleted file mode 100644
index 5de1e5e653d9..000000000000
--- a/sysutils/u-boot-master/files/patch-api_api.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- api/api.c.orig	2018-07-09 14:24:14 UTC
-+++ api/api.c
-@@ -289,6 +289,11 @@ static int API_dev_close(va_list ap)
- 	if (!err)
- 		di->state = DEV_STA_CLOSED;
- 
-+	if (dcache_status())
-+		flush_dcache_all();
-+	if (icache_status())
-+		invalidate_icache_all();
-+
- 	return err;
- }
- 
diff --git a/sysutils/u-boot-master/files/patch-api_api__storage.c b/sysutils/u-boot-master/files/patch-api_api__storage.c
deleted file mode 100644
index 2e5846fb9a5c..000000000000
--- a/sysutils/u-boot-master/files/patch-api_api__storage.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- api/api_storage.c.orig	2019-07-08 19:23:28 UTC
-+++ api/api_storage.c
-@@ -69,13 +69,6 @@ void dev_stor_init(void)
- 	specs[ENUM_SATA].type = DEV_TYP_STOR | DT_STOR_SATA;
- 	specs[ENUM_SATA].name = "sata";
- #endif
--#if defined(CONFIG_SCSI)
--	specs[ENUM_SCSI].max_dev = CONFIG_SYS_SCSI_MAX_DEVICE;
--	specs[ENUM_SCSI].enum_started = 0;
--	specs[ENUM_SCSI].enum_ended = 0;
--	specs[ENUM_SCSI].type = DEV_TYP_STOR | DT_STOR_SCSI;
--	specs[ENUM_SCSI].name = "scsi";
--#endif
- #if defined(CONFIG_CMD_USB) && defined(CONFIG_USB_STORAGE)
- 	specs[ENUM_USB].max_dev = USB_MAX_STOR_DEV;
- 	specs[ENUM_USB].enum_started = 0;
-@@ -281,7 +274,7 @@ int dev_enum_storage(struct device_info *di)
- {
- 	int i;
- 
--	/* check: ide, usb, scsi, mmc */
-+	/* check: ide, usb, mmc */
- 	for (i = ENUM_IDE; i < ENUM_MAX; i ++) {
- 		if (dev_enum_stor(i, di))
- 			return 1;
diff --git a/sysutils/u-boot-master/files/patch-cmd_boot.c b/sysutils/u-boot-master/files/patch-cmd_boot.c
deleted file mode 100644
index b0c520aeb2ed..000000000000
--- a/sysutils/u-boot-master/files/patch-cmd_boot.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- cmd/boot.c.orig	2018-07-09 14:24:14 UTC
-+++ cmd/boot.c
-@@ -18,6 +18,10 @@ __attribute__((weak))
- unsigned long do_go_exec(ulong (*entry)(int, char * const []), int argc,
- 				 char * const argv[])
- {
-+	if (dcache_status())
-+		flush_dcache_all();
-+	if (icache_status())
-+		invalidate_icache_all();
- 	return entry (argc, argv);
- }
- 
diff --git a/sysutils/u-boot-master/files/patch-cmd_elf.c b/sysutils/u-boot-master/files/patch-cmd_elf.c
deleted file mode 100644
index a6cac78a0989..000000000000
--- a/sysutils/u-boot-master/files/patch-cmd_elf.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- cmd/elf.c.orig	2018-07-09 14:24:14 UTC
-+++ cmd/elf.c
-@@ -153,6 +153,11 @@ static unsigned long do_bootelf_exec(ulong (*entry)(in
- {
- 	unsigned long ret;
- 
-+	if (dcache_status())
-+		flush_dcache_all();
-+	if (icache_status())
-+		invalidate_icache_all();
-+
- 	/*
- 	 * pass address parameter as argv[0] (aka command name),
- 	 * and all remaining args
diff --git a/sysutils/u-boot-nanopi-m1plus/Makefile b/sysutils/u-boot-nanopi-m1plus/Makefile
index 12ce943fab6f..6ecb5458972e 100644
--- a/sysutils/u-boot-nanopi-m1plus/Makefile
+++ b/sysutils/u-boot-nanopi-m1plus/Makefile
@@ -1,7 +1,9 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		nanopi_m1plus
 BOARD_CONFIG=	nanopi_m1_plus_defconfig
 FAMILY=		allwinner
 
+U_BOOT_SLAVE_PORTREVISION_2021.04=	1
+
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-nanopi-neo-air/Makefile b/sysutils/u-boot-nanopi-neo-air/Makefile
index b3d99c0565ba..fe25f5ed224f 100644
--- a/sysutils/u-boot-nanopi-neo-air/Makefile
+++ b/sysutils/u-boot-nanopi-neo-air/Makefile
@@ -1,7 +1,9 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		nanopi_neo_air
 BOARD_CONFIG=	nanopi_neo_air_defconfig
 FAMILY=		allwinner
 
+U_BOOT_SLAVE_PORTREVISION_2021.04=	1
+
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-nanopi-neo/Makefile b/sysutils/u-boot-nanopi-neo/Makefile
index a9439ce1df49..2be631dac48c 100644
--- a/sysutils/u-boot-nanopi-neo/Makefile
+++ b/sysutils/u-boot-nanopi-neo/Makefile
@@ -1,7 +1,9 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		nanopi_neo
 BOARD_CONFIG=	nanopi_neo_defconfig
 FAMILY=		allwinner
 
+U_BOOT_SLAVE_PORTREVISION_2021.04=	1
+
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-olimex-a20-som-evb/Makefile b/sysutils/u-boot-olimex-a20-som-evb/Makefile
index b18d1681e6ce..5f1c7a96bddd 100644
--- a/sysutils/u-boot-olimex-a20-som-evb/Makefile
+++ b/sysutils/u-boot-olimex-a20-som-evb/Makefile
@@ -1,7 +1,9 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		olimex-a20-som-evb
 BOARD_CONFIG=	A20-Olimex-SOM-EVB_defconfig
 FAMILY=		allwinner
 
+U_BOOT_SLAVE_PORTREVISION_2021.04=	1
+
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-olinuxino-lime/Makefile b/sysutils/u-boot-olinuxino-lime/Makefile
index d547189f2e7f..a411daa30779 100644
--- a/sysutils/u-boot-olinuxino-lime/Makefile
+++ b/sysutils/u-boot-olinuxino-lime/Makefile
@@ -1,7 +1,9 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		olinuxino-lime
 BOARD_CONFIG=	A10-OLinuXino-Lime_defconfig
 FAMILY=		allwinner
 
+U_BOOT_SLAVE_PORTREVISION_2021.04=	1
+
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-olinuxino-lime2-emmc/Makefile b/sysutils/u-boot-olinuxino-lime2-emmc/Makefile
index 9a8690cf7cf1..cded1087a2ae 100644
--- a/sysutils/u-boot-olinuxino-lime2-emmc/Makefile
+++ b/sysutils/u-boot-olinuxino-lime2-emmc/Makefile
@@ -1,7 +1,9 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		olinuxino-lime2-emmc
 BOARD_CONFIG=	A20-OLinuXino-Lime2-eMMC_defconfig
 FAMILY=		allwinner
 
+U_BOOT_SLAVE_PORTREVISION_2021.04=	1
+
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-olinuxino-lime2/Makefile b/sysutils/u-boot-olinuxino-lime2/Makefile
index 01f63220757b..5445b5d7286c 100644
--- a/sysutils/u-boot-olinuxino-lime2/Makefile
+++ b/sysutils/u-boot-olinuxino-lime2/Makefile
@@ -1,7 +1,9 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		olinuxino-lime2
 BOARD_CONFIG=	A20-OLinuXino-Lime2_defconfig
 FAMILY=		allwinner
 
+U_BOOT_SLAVE_PORTREVISION_2021.04=	1
+
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-orangepi-one/Makefile b/sysutils/u-boot-orangepi-one/Makefile
index a2f9701b2df4..bc7d91ed122f 100644
--- a/sysutils/u-boot-orangepi-one/Makefile
+++ b/sysutils/u-boot-orangepi-one/Makefile
@@ -1,7 +1,9 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		orangepi-one
 BOARD_CONFIG=	orangepi_one_defconfig
 FAMILY=		allwinner
 
+U_BOOT_SLAVE_PORTREVISION_2021.04=	1
+
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-orangepi-pc-plus/Makefile b/sysutils/u-boot-orangepi-pc-plus/Makefile
index bf950cb76382..e35b61d7bb1b 100644
--- a/sysutils/u-boot-orangepi-pc-plus/Makefile
+++ b/sysutils/u-boot-orangepi-pc-plus/Makefile
@@ -1,7 +1,9 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		orangepi-pc-plus
 BOARD_CONFIG=	orangepi_pc_plus_defconfig
 FAMILY=		allwinner
 
+U_BOOT_SLAVE_PORTREVISION_2021.04=	1
+
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-orangepi-pc/Makefile b/sysutils/u-boot-orangepi-pc/Makefile
index 08affd797db7..a8d03f452999 100644
--- a/sysutils/u-boot-orangepi-pc/Makefile
+++ b/sysutils/u-boot-orangepi-pc/Makefile
@@ -1,7 +1,9 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		orangepi-pc
 BOARD_CONFIG=	orangepi_pc_defconfig
 FAMILY=		allwinner
 
+U_BOOT_SLAVE_PORTREVISION_2021.04=	1
+
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-orangepi-plus-2e/Makefile b/sysutils/u-boot-orangepi-plus-2e/Makefile
index c5dc081f8d8f..6b0d00d5f3ab 100644
--- a/sysutils/u-boot-orangepi-plus-2e/Makefile
+++ b/sysutils/u-boot-orangepi-plus-2e/Makefile
@@ -1,9 +1,11 @@
 # Created by: Jov <amutu@amutu.com>
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		orangepi-plus-2e
 BOARD_CONFIG=	orangepi_plus2e_defconfig
 FAMILY=		allwinner
 
+U_BOOT_SLAVE_PORTREVISION_2021.04=	1
+
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-orangepi-r1/Makefile b/sysutils/u-boot-orangepi-r1/Makefile
index ae7eef62684d..060751d7153a 100644
--- a/sysutils/u-boot-orangepi-r1/Makefile
+++ b/sysutils/u-boot-orangepi-r1/Makefile
@@ -1,7 +1,9 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		orangepi_r1
 BOARD_CONFIG=	orangepi_r1_defconfig
 FAMILY=		allwinner
 
+U_BOOT_SLAVE_PORTREVISION_2021.04=	1
+
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-orangepi-zero/Makefile b/sysutils/u-boot-orangepi-zero/Makefile
index 505d6ac83724..a88846c7676e 100644
--- a/sysutils/u-boot-orangepi-zero/Makefile
+++ b/sysutils/u-boot-orangepi-zero/Makefile
@@ -1,7 +1,9 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		orangepi-zero
 BOARD_CONFIG=	orangepi_zero_defconfig
 FAMILY=		allwinner
 
+U_BOOT_SLAVE_PORTREVISION_2021.04=	1
+
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-pandaboard/Makefile b/sysutils/u-boot-pandaboard/Makefile
index abb4a8a6b999..7396e16fd817 100644
--- a/sysutils/u-boot-pandaboard/Makefile
+++ b/sysutils/u-boot-pandaboard/Makefile
@@ -1,7 +1,9 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		pandaboard
 BOARD_CONFIG=	omap4_panda_defconfig
 FAMILY=		omap
 
+U_BOOT_SLAVE_PORTREVISION_2021.04=	1
+
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-pcduino3/Makefile b/sysutils/u-boot-pcduino3/Makefile
index 2b6d57ffb75b..51ae832dec4b 100644
--- a/sysutils/u-boot-pcduino3/Makefile
+++ b/sysutils/u-boot-pcduino3/Makefile
@@ -1,7 +1,9 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		pcduino3
 BOARD_CONFIG=	Linksprite_pcDuino3_defconfig
 FAMILY=		allwinner
 
+U_BOOT_SLAVE_PORTREVISION_2021.04=	1
+
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-qemu-arm/Makefile b/sysutils/u-boot-qemu-arm/Makefile
index ac8bbfa94374..6a2c20a1cd68 100644
--- a/sysutils/u-boot-qemu-arm/Makefile
+++ b/sysutils/u-boot-qemu-arm/Makefile
@@ -1,9 +1,11 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		qemu-arm
 BOARD_CONFIG=	qemu_arm_defconfig
 FAMILY=		qemu
 
+U_BOOT_SLAVE_PORTREVISION_2021.04=	1
+
 UBOOT_PLIST=	u-boot.bin
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-riotboard/Makefile b/sysutils/u-boot-riotboard/Makefile
index 711a16232b7d..39193c5e6c30 100644
--- a/sysutils/u-boot-riotboard/Makefile
+++ b/sysutils/u-boot-riotboard/Makefile
@@ -1,9 +1,11 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		riotboard
 BOARD_CONFIG=	riotboard_defconfig
 FAMILY=		imx6
 
+U_BOOT_SLAVE_PORTREVISION_2021.04=	1
+
 UBOOT_PLIST=	u-boot.imx
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-rpi-0-w/Makefile b/sysutils/u-boot-rpi-0-w/Makefile
index 37cd2a34ad81..991bf5c58059 100644
--- a/sysutils/u-boot-rpi-0-w/Makefile
+++ b/sysutils/u-boot-rpi-0-w/Makefile
@@ -1,14 +1,16 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 PATCHFILES+=	939129/raw
 
 MODEL=		rpi-0-w
 BOARD_CONFIG=	rpi_0_w_defconfig
 FAMILY=		rpi
 
+U_BOOT_SLAVE_PORTREVISION_2021.04=	1
+
 DEPENDS=	${LOCALBASE}/share/rpi-firmware/bootcode.bin:sysutils/rpi-firmware
 
 CONFIG_FRAGMENT=	${.CURDIR}/files/rpi_0_w_fragment
 FRAGMENT_NAME=		rpi_0_w_fragment
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-rpi/Makefile b/sysutils/u-boot-rpi/Makefile
index 52de21af33e1..de1a2be000f5 100644
--- a/sysutils/u-boot-rpi/Makefile
+++ b/sysutils/u-boot-rpi/Makefile
@@ -1,14 +1,16 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 PATCHFILES+=	939129/raw
 
 MODEL=		rpi
 BOARD_CONFIG=	rpi_defconfig
 FAMILY=		rpi
 
+U_BOOT_SLAVE_PORTREVISION_2021.04=	1
+
 DEPENDS=	${LOCALBASE}/share/rpi-firmware/bootcode.bin:sysutils/rpi-firmware
 
 CONFIG_FRAGMENT=	${.CURDIR}/files/rpi_fragment
 FRAGMENT_NAME=		rpi_fragment
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-rpi2/Makefile b/sysutils/u-boot-rpi2/Makefile
index f875b8840cab..d11d15970b04 100644
--- a/sysutils/u-boot-rpi2/Makefile
+++ b/sysutils/u-boot-rpi2/Makefile
@@ -1,14 +1,16 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 PATCHFILES+=	939129/raw
 
 MODEL=		rpi2
 BOARD_CONFIG=	rpi_2_defconfig
 FAMILY=		rpi
 
+U_BOOT_SLAVE_PORTREVISION_2021.04=	1
+
 DEPENDS=	${LOCALBASE}/share/rpi-firmware/bootcode.bin:sysutils/rpi-firmware
 
 CONFIG_FRAGMENT=	${.CURDIR}/files/rpi2_fragment
 FRAGMENT_NAME=	rpi2_fragment
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-rpi3-32/Makefile b/sysutils/u-boot-rpi3-32/Makefile
index 777cd58d3c55..68e4ed003145 100644
--- a/sysutils/u-boot-rpi3-32/Makefile
+++ b/sysutils/u-boot-rpi3-32/Makefile
@@ -1,6 +1,8 @@
 MODEL=		rpi3-32
 BOARD_CONFIG=	rpi_3_32b_defconfig
 UBOOT_ARCH=	arm
 EXTRA_PATCHES=	
 
+U_BOOT_SLAVE_PORTREVISION_2021.04=	1
+
 .include "${.CURDIR}/../u-boot-rpi3/Makefile"
diff --git a/sysutils/u-boot-sinovoip-bpi-m3/Makefile b/sysutils/u-boot-sinovoip-bpi-m3/Makefile
index 73004eea1b93..865c63ddd889 100644
--- a/sysutils/u-boot-sinovoip-bpi-m3/Makefile
+++ b/sysutils/u-boot-sinovoip-bpi-m3/Makefile
@@ -1,7 +1,9 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		sinovoip-bpi-m3
 BOARD_CONFIG=	Sinovoip_BPI_M3_defconfig
 FAMILY=		allwinner
 
+U_BOOT_SLAVE_PORTREVISION_2021.04=	1
+
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-wandboard/Makefile b/sysutils/u-boot-wandboard/Makefile
index f4844c0a9f9d..2d21614591a0 100644
--- a/sysutils/u-boot-wandboard/Makefile
+++ b/sysutils/u-boot-wandboard/Makefile
@@ -1,15 +1,17 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		wandboard
 BOARD_CONFIG=	wandboard_defconfig
 FAMILY=		imx6
 
+U_BOOT_SLAVE_PORTREVISION_2021.04=	1
+
 IMXFILE=	u-boot.imx
 UBOOT_PLIST=	${IMXFILE}
 
 ALL_TARGET=	u-boot-with-spl.imx
 
 pre-install: .PHONY
 	@${CP} ${WRKSRC}/u-boot-with-spl.imx ${WRKSRC}/${IMXFILE}
 
 .include "${MASTERDIR}/Makefile"