diff --git a/sysutils/atf-master/Makefile b/sysutils/atf-master/Makefile
index 3519d63e0a94..8abc5764eead 100644
--- a/sysutils/atf-master/Makefile
+++ b/sysutils/atf-master/Makefile
@@ -1,45 +1,45 @@
 # $FreeBSD$
 
 PORTNAME=	atf
 PORTVERSION?=	${ATF_VERSION}
 CATEGORIES=	sysutils
 PKGNAMESUFFIX?=	-${PLAT}
 
 MAINTAINER=	uboot@FreeBSD.org
 COMMENT=	ARM TF-A for platform ${PLAT}
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS+=	aarch64-none-elf-gcc:devel/aarch64-none-elf-gcc
 
 USES=	gmake
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ARM-software
 GH_PROJECT=	arm-trusted-firmware
 GH_TAGNAME=	${ATF_VERSION}
 
 SSP_UNSAFE=	yes
 MAKE_ENV+=	CROSS_COMPILE="aarch64-none-elf-"
 ALL_TARGET=	ARCH="aarch64" PLAT=${PLAT} V=1 CFLAGS= bl31
 
 # Default to the latest release
-ATF_VERSION?=	v2.3
+ATF_VERSION?=	v2.4
 
 PLIST_FILES?=	${PREFIX}/share/${PORTNAME}-${PLAT}/${BL31:T}
 
 DESCR?=		${.CURDIR}/pkg-descr
 
 NO_ARCH=	yes
 
 .if !defined(PLAT)
 PLAT=		NONE
 IGNORE=		is a metaport; there is nothing to build
 .endif
 
 do-install:
 	${MKDIR} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/
 	${INSTALL_DATA} ${WRKSRC}/build/${PLAT}/release/${BL31} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/
 	${INSTALL_DATA} ${DESCR} ${STAGEDIR}/${INST}/README
 
 .include <bsd.port.mk>
diff --git a/sysutils/atf-master/distinfo b/sysutils/atf-master/distinfo
index d4a448e02f8d..d1acd15798f3 100644
--- a/sysutils/atf-master/distinfo
+++ b/sysutils/atf-master/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1587662546
-SHA256 (ARM-software-arm-trusted-firmware-v2.3_GH0.tar.gz) = 304d372327d6ecabf89da67e2e1a7b2660f13b5851886fef1b58ae5a6d74e606
-SIZE (ARM-software-arm-trusted-firmware-v2.3_GH0.tar.gz) = 4321775
+TIMESTAMP = 1606065143
+SHA256 (ARM-software-arm-trusted-firmware-v2.4_GH0.tar.gz) = 4bfda9fdbe5022f2e88ad3344165f7d38a8ae4a0e2d91d44d9a1603425cc642d
+SIZE (ARM-software-arm-trusted-firmware-v2.4_GH0.tar.gz) = 4593582
diff --git a/sysutils/u-boot-a64-olinuxino/Makefile b/sysutils/u-boot-a64-olinuxino/Makefile
index ae7687e45db8..ee1e13f738cd 100644
--- a/sysutils/u-boot-a64-olinuxino/Makefile
+++ b/sysutils/u-boot-a64-olinuxino/Makefile
@@ -1,9 +1,11 @@
 # $FreeBSD$
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+U_BOOT_SLAVE_PORTREVISION_2020.10=	1
+
 MODEL=		a64-olinuxino
 BOARD_CONFIG=	a64-olinuxino_defconfig
 FAMILY=		allwinner64
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-a64-olinuxino/pkg-descr b/sysutils/u-boot-a64-olinuxino/pkg-descr
index c7a13ae5bf61..8d64aa7ce556 100644
--- a/sysutils/u-boot-a64-olinuxino/pkg-descr
+++ b/sysutils/u-boot-a64-olinuxino/pkg-descr
@@ -1,9 +1,9 @@
 U-Boot loader and related files for the A64-Olinuxino.
 
 To install this bootloader on an sdcard just do:
-dd if=/usr/local/share/u-boot/u-boot-a64-olinuxino/u-boot-sunxi-with-spl.bin of=/path/to/sdcarddevice bs=1k seek=8 conv=sync
+dd if=/usr/local/share/u-boot/u-boot-a64-olinuxino/u-boot-sunxi-with-spl.bin of=/path/to/sdcarddevice bs=128k seek=1 conv=sync
 
 For information about running FreeBSD on Allwinner boards, see
 https://wiki.freebsd.org/FreeBSD/arm/Allwinner
 
 WWW: https://www.denx.de/wiki/U-Boot
diff --git a/sysutils/u-boot-firefly-rk3399/Makefile b/sysutils/u-boot-firefly-rk3399/Makefile
index 6c8db0dcd304..632094ec99e0 100644
--- a/sysutils/u-boot-firefly-rk3399/Makefile
+++ b/sysutils/u-boot-firefly-rk3399/Makefile
@@ -1,9 +1,11 @@
 # $FreeBSD$
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+U_BOOT_SLAVE_PORTREVISION_2020.10=	1
+
 MODEL=		firefly-rk3399
 BOARD_CONFIG=	firefly-rk3399_defconfig
 FAMILY=		rk3399
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-firefly-rk3399/pkg-descr b/sysutils/u-boot-firefly-rk3399/pkg-descr
index 2b5a92b3b9cf..8098fcf4d42d 100644
--- a/sysutils/u-boot-firefly-rk3399/pkg-descr
+++ b/sysutils/u-boot-firefly-rk3399/pkg-descr
@@ -1,7 +1,7 @@
 U-Boot loader and related files for the Firefly RK3399.
 
 To install this bootloader on an sdcard just do:
-dd if=/usr/local/share/u-boot/u-boot-firefly-rk3399/idbloader.img of=/path/to/sdcarddevice seek=64
-dd if=/usr/local/share/u-boot/u-boot-firefly-rk3399/u-boot.itb of=/path/to/sdcarddevice seek=16384 conv=sync
+dd if=/usr/local/share/u-boot/u-boot-firefly-rk3399/idbloader.img of=/path/to/sdcarddevice seek=64 bs=512 conv=sync
+dd if=/usr/local/share/u-boot/u-boot-firefly-rk3399/u-boot.itb of=/path/to/sdcarddevice seek=16384 bs=512 conv=sync
 
 WWW: https://www.denx.de/wiki/U-Boot
diff --git a/sysutils/u-boot-master/Makefile b/sysutils/u-boot-master/Makefile
index 035eb328a3a6..e518ec6a4afd 100644
--- a/sysutils/u-boot-master/Makefile
+++ b/sysutils/u-boot-master/Makefile
@@ -1,250 +1,250 @@
 # $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 \
 		swig:devel/swig \
 		dtc>=1.4.1:sysutils/dtc \
 		mkimage:sysutils/u-boot-tools
 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=	8
-UBOOT_METADATA_ALLWINNER64_RAW_BS=	1k
+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?=	2020.10
 
 # 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
 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(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
 # 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-nanopi-a64/Makefile b/sysutils/u-boot-nanopi-a64/Makefile
index 6db26e47127e..137f44c12ae2 100644
--- a/sysutils/u-boot-nanopi-a64/Makefile
+++ b/sysutils/u-boot-nanopi-a64/Makefile
@@ -1,9 +1,11 @@
 # $FreeBSD$
 
 MASTERDIR=     ${.CURDIR}/../u-boot-master
 
+U_BOOT_SLAVE_PORTREVISION_2020.10=	1
+
 MODEL=         nanopi_a64
 BOARD_CONFIG=  nanopi_a64_defconfig
 FAMILY=                allwinner64
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-nanopi-a64/pkg-descr b/sysutils/u-boot-nanopi-a64/pkg-descr
index 916ac3f9f8f8..96d3098c8a8c 100644
--- a/sysutils/u-boot-nanopi-a64/pkg-descr
+++ b/sysutils/u-boot-nanopi-a64/pkg-descr
@@ -1,9 +1,9 @@
 U-Boot loader and related files for the NanoPI A64.
 
 To install this bootloader on an sdcard just do:
-dd if=/usr/local/share/u-boot/u-boot-nanopi-a64/u-boot-sunxi-with-spl.bin of=/path/to/sdcarddevice bs=1k seek=8 conv=sync
+dd if=/usr/local/share/u-boot/u-boot-nanopi-a64/u-boot-sunxi-with-spl.bin of=/path/to/sdcarddevice bs=128k seek=1 conv=sync
 
 For information about running FreeBSD on Allwinner boards, see
 https://wiki.freebsd.org/FreeBSD/arm/Allwinner
 
 WWW: https://www.denx.de/wiki/U-Boot
diff --git a/sysutils/u-boot-nanopi-neo2/Makefile b/sysutils/u-boot-nanopi-neo2/Makefile
index bf7fa9c7a32d..2dc070635ca9 100644
--- a/sysutils/u-boot-nanopi-neo2/Makefile
+++ b/sysutils/u-boot-nanopi-neo2/Makefile
@@ -1,9 +1,11 @@
 # $FreeBSD$
 
 MASTERDIR=     ${.CURDIR}/../u-boot-master
 
+U_BOOT_SLAVE_PORTREVISION_2020.10=	1
+
 MODEL=         nanopi-neo2
 BOARD_CONFIG=  nanopi_neo2_defconfig
 FAMILY=                allwinner64
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-nanopi-neo2/pkg-descr b/sysutils/u-boot-nanopi-neo2/pkg-descr
index 652d7546e776..80d46e2e91fa 100644
--- a/sysutils/u-boot-nanopi-neo2/pkg-descr
+++ b/sysutils/u-boot-nanopi-neo2/pkg-descr
@@ -1,9 +1,9 @@
 U-Boot loader and related files for the NanoPi NEO2
 
 To install this bootloader on an sdcard just do:
-dd if=$LOCALBASE/share/u-boot/u-boot-nanopi-neo2/u-boot-sunxi-with-spl.bin of=/path/to/sdcarddevice bs=1k seek=8 conv=sync
+dd if=$LOCALBASE/share/u-boot/u-boot-nanopi-neo2/u-boot-sunxi-with-spl.bin of=/path/to/sdcarddevice bs=128k seek=1 conv=sync
 
 For information about running FreeBSD on Allwinner boards, see
 https://wiki.freebsd.org/FreeBSD/arm/Allwinner
 
 WWW: https://www.denx.de/wiki/U-Boot
diff --git a/sysutils/u-boot-orangepi-pc2/Makefile b/sysutils/u-boot-orangepi-pc2/Makefile
index 53321b644687..41f5ce495fd9 100644
--- a/sysutils/u-boot-orangepi-pc2/Makefile
+++ b/sysutils/u-boot-orangepi-pc2/Makefile
@@ -1,9 +1,11 @@
 # $FreeBSD$
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+U_BOOT_SLAVE_PORTREVISION_2020.10=	1
+
 MODEL=		orangepi-pc2
 BOARD_CONFIG=	orangepi_pc2_defconfig
 FAMILY=		allwinner64
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-orangepi-pc2/pkg-descr b/sysutils/u-boot-orangepi-pc2/pkg-descr
index 885250948adf..7b5319e2a217 100644
--- a/sysutils/u-boot-orangepi-pc2/pkg-descr
+++ b/sysutils/u-boot-orangepi-pc2/pkg-descr
@@ -1,9 +1,9 @@
 U-Boot loader and related files for the OrangePi PC2
 
 To install this bootloader on an sdcard just do:
-dd if=$LOCALBASE/share/u-boot/u-boot-orangepi-pc2/u-boot-sunxi-with-spl.bin of=/path/to/sdcarddevice bs=1k seek=8 conv=sync
+dd if=$LOCALBASE/share/u-boot/u-boot-orangepi-pc2/u-boot-sunxi-with-spl.bin of=/path/to/sdcarddevice bs=128k seek=1 conv=sync
 
 For information about running FreeBSD on Allwinner boards, see
 https://wiki.freebsd.org/FreeBSD/arm/Allwinner
 
 WWW: https://www.denx.de/wiki/U-Boot
diff --git a/sysutils/u-boot-pine64-lts/Makefile b/sysutils/u-boot-pine64-lts/Makefile
index 5ca58779312e..09a08f282807 100644
--- a/sysutils/u-boot-pine64-lts/Makefile
+++ b/sysutils/u-boot-pine64-lts/Makefile
@@ -1,9 +1,11 @@
 # $FreeBSD$
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+U_BOOT_SLAVE_PORTREVISION_2020.10=	1
+
 MODEL=		pine64-lts
 BOARD_CONFIG=	pine64-lts_defconfig
 FAMILY=		allwinner64
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-pine64-lts/pkg-descr b/sysutils/u-boot-pine64-lts/pkg-descr
index 862c1d0d3f4f..f1c3f780cd85 100644
--- a/sysutils/u-boot-pine64-lts/pkg-descr
+++ b/sysutils/u-boot-pine64-lts/pkg-descr
@@ -1,9 +1,9 @@
 U-Boot loader and related files for the Pine64-LTS.
 
 To install this bootloader on an sdcard just do:
-dd if=/usr/local/share/u-boot/u-boot-pine64-lts/u-boot-sunxi-with-spl.bin of=/path/to/sdcarddevice bs=1k seek=8 conv=sync
+dd if=/usr/local/share/u-boot/u-boot-pine64-lts/u-boot-sunxi-with-spl.bin of=/path/to/sdcarddevice bs=128k seek=1 conv=sync
 
 For information about running FreeBSD on Allwinner boards, see
  https://wiki.freebsd.org/FreeBSD/arm/Allwinner
 
 WWW: https://www.denx.de/wiki/U-Boot
diff --git a/sysutils/u-boot-pine64/Makefile b/sysutils/u-boot-pine64/Makefile
index 845d03875b90..0effcdca79d4 100644
--- a/sysutils/u-boot-pine64/Makefile
+++ b/sysutils/u-boot-pine64/Makefile
@@ -1,9 +1,11 @@
 # $FreeBSD$
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+U_BOOT_SLAVE_PORTREVISION_2020.10=	1
+
 MODEL=		pine64
 BOARD_CONFIG=	pine64_plus_defconfig
 FAMILY=		allwinner64
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-pine64/pkg-descr b/sysutils/u-boot-pine64/pkg-descr
index 10e602243859..5f8ccdd48ad0 100644
--- a/sysutils/u-boot-pine64/pkg-descr
+++ b/sysutils/u-boot-pine64/pkg-descr
@@ -1,9 +1,9 @@
 U-Boot loader and related files for the Pine64.
 
 To install this bootloader on an sdcard just do:
-dd if=/usr/local/share/u-boot/u-boot-pine64/u-boot-sunxi-with-spl.bin of=/path/to/sdcarddevice bs=1k seek=8 conv=sync
+dd if=/usr/local/share/u-boot/u-boot-pine64/u-boot-sunxi-with-spl.bin of=/path/to/sdcarddevice bs=128k seek=1 conv=sync
 
 For information about running FreeBSD on Allwinner boards, see
  https://wiki.freebsd.org/FreeBSD/arm/Allwinner
 
 For general information about U-Boot see WWW: https://www.denx.de/wiki/U-Boot
diff --git a/sysutils/u-boot-pinebook/Makefile b/sysutils/u-boot-pinebook/Makefile
index 62e09f1f145f..31eee3e460e6 100644
--- a/sysutils/u-boot-pinebook/Makefile
+++ b/sysutils/u-boot-pinebook/Makefile
@@ -1,9 +1,11 @@
 # $FreeBSD$
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+U_BOOT_SLAVE_PORTREVISION_2020.10=	1
+
 MODEL=		pinebook
 BOARD_CONFIG=	pinebook_defconfig
 FAMILY=		allwinner64
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-pinebook/pkg-descr b/sysutils/u-boot-pinebook/pkg-descr
index 62e939b75918..761f8074e8ee 100644
--- a/sysutils/u-boot-pinebook/pkg-descr
+++ b/sysutils/u-boot-pinebook/pkg-descr
@@ -1,9 +1,9 @@
 U-Boot loader and related files for the Pinebook
 
 To install this bootloader on an sdcard just do:
-dd if=/usr/local/share/u-boot/u-boot-pinebook/u-boot-sunxi-with-spl.bin of=/path/to/sdcarddevice bs=1k seek=8 conv=sync
+dd if=/usr/local/share/u-boot/u-boot-pinebook/u-boot-sunxi-with-spl.bin of=/path/to/sdcarddevice bs=128k seek=1 conv=sync
 
 For information about running FreeBSD on Allwinner boards, see
  https://wiki.freebsd.org/FreeBSD/arm/Allwinner
 
 For general information about U-Boot see WWW: https://www.denx.de/wiki/U-Boot
diff --git a/sysutils/u-boot-pinebookpro/Makefile b/sysutils/u-boot-pinebookpro/Makefile
index 827b2f278a38..63ec8eac9dbb 100644
--- a/sysutils/u-boot-pinebookpro/Makefile
+++ b/sysutils/u-boot-pinebookpro/Makefile
@@ -1,9 +1,11 @@
 # $FreeBSD$
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+U_BOOT_SLAVE_PORTREVISION_2020.10=	1
+
 MODEL=		pinebookpro
 BOARD_CONFIG=	pinebook-pro-rk3399_defconfig
 FAMILY=		rk3399
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-rock64/Makefile b/sysutils/u-boot-rock64/Makefile
index f62058e154f3..6d94e8c659d1 100644
--- a/sysutils/u-boot-rock64/Makefile
+++ b/sysutils/u-boot-rock64/Makefile
@@ -1,11 +1,13 @@
 # $FreeBSD$
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+U_BOOT_SLAVE_PORTREVISION_2020.10=	1
+
 MODEL=		rock64
 BOARD_CONFIG=	rock64-rk3328_defconfig
 FAMILY=		rk3328
 
 UBOOT_EXTRA_TARGETS=	u-boot.itb
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-rockpro64/Makefile b/sysutils/u-boot-rockpro64/Makefile
index 1711297e51fe..6883d9968c00 100644
--- a/sysutils/u-boot-rockpro64/Makefile
+++ b/sysutils/u-boot-rockpro64/Makefile
@@ -1,11 +1,13 @@
 # $FreeBSD$
 
 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
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-sopine-spi/Makefile b/sysutils/u-boot-sopine-spi/Makefile
index b11e6b911c9a..a1b13e2617fa 100644
--- a/sysutils/u-boot-sopine-spi/Makefile
+++ b/sysutils/u-boot-sopine-spi/Makefile
@@ -1,26 +1,28 @@
 # $FreeBSD$
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+U_BOOT_SLAVE_PORTREVISION_2020.10=	1
+
 MODEL=		sopine-spi
 BOARD_CONFIG=	sopine_baseboard_defconfig
 FAMILY=		allwinner64
 
 CONFIG_FRAGMENT=	${.CURDIR}/../u-boot-sopine-spi/files/spi_fragment
 FRAGMENT_NAME=		spi_fragment
 NO_METADATA=		yes
 UBOOT_PLIST=		u-boot-sunxi-with-spl.bin \
 			boot.scr
 PLIST_EXTRAS=		sopine-spi-flasher.img
 IGNORE_FreeBSD_11=	No makefs msdos support
 
 post-build:
 	mkimage -C none -A arm64 -T script -d ${.CURDIR}/../u-boot-sopine-spi/files/boot.cmd ${WRKSRC}/boot.scr
 
 post-stage:
 	makefs -t msdos -s 5m ${WRKDIR}/sopine-spi-flash.msdos ${STAGEDIR}/${INST}
 	mkimg -v -s mbr -p fat32::5M:1M -o ${STAGEDIR}/${INST}/sopine-spi-flasher.img
 	dd if=${WRKDIR}/sopine-spi-flash.msdos of=${STAGEDIR}/${INST}/sopine-spi-flasher.img bs=1M oseek=1 conv=notrunc
 	dd if=${STAGEDIR}/${INST}/u-boot-sunxi-with-spl.bin of=${STAGEDIR}/${INST}/sopine-spi-flasher.img bs=1k oseek=8 conv=notrunc
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-sopine/Makefile b/sysutils/u-boot-sopine/Makefile
index 577130b871f8..3120d997346a 100644
--- a/sysutils/u-boot-sopine/Makefile
+++ b/sysutils/u-boot-sopine/Makefile
@@ -1,9 +1,11 @@
 # $FreeBSD$
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+U_BOOT_SLAVE_PORTREVISION_2020.10=	1
+
 MODEL=		sopine
 BOARD_CONFIG=	sopine_baseboard_defconfig
 FAMILY=		allwinner64
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-sopine/pkg-descr b/sysutils/u-boot-sopine/pkg-descr
index ae99075cb7cd..8752e72b2bef 100644
--- a/sysutils/u-boot-sopine/pkg-descr
+++ b/sysutils/u-boot-sopine/pkg-descr
@@ -1,9 +1,9 @@
 U-Boot loader and related files for the Sopine.
 
 To install this bootloader on an sdcard just do:
-dd if=/usr/local/share/u-boot/u-boot-sopine/u-boot-sunxi-with-spl.bin of=/path/to/sdcarddevice bs=1k seek=8 conv=sync
+dd if=/usr/local/share/u-boot/u-boot-sopine/u-boot-sunxi-with-spl.bin of=/path/to/sdcarddevice bs=128k seek=1 conv=sync
 
 For information about running FreeBSD on Allwinner boards, see
  https://wiki.freebsd.org/FreeBSD/arm/Allwinner
 
 WWW: https://www.denx.de/wiki/U-Boot