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
@@ -24,7 +24,7 @@ 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}
 
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
@@ -2,6 +2,8 @@
 
 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-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,7 +1,7 @@
 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
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
@@ -2,6 +2,8 @@
 
 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-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
@@ -71,8 +71,8 @@ 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
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
@@ -2,6 +2,8 @@
 
 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-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,7 +1,7 @@
 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
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
@@ -2,6 +2,8 @@
 
 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-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,7 +1,7 @@
 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
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
@@ -2,6 +2,8 @@
 
 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-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,7 +1,7 @@
 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
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
@@ -2,6 +2,8 @@
 
 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-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,7 +1,7 @@
 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
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
@@ -2,6 +2,8 @@
 
 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-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,7 +1,7 @@
 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
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
@@ -2,6 +2,8 @@
 
 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-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,7 +1,7 @@
 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
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
@@ -2,6 +2,8 @@
 
 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 f62058e154f3..6d94e8c659d1 100644
--- a/sysutils/u-boot-rock64/Makefile
+++ b/sysutils/u-boot-rock64/Makefile
@@ -2,6 +2,8 @@
 
 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 1711297e51fe..6883d9968c00 100644
--- a/sysutils/u-boot-rockpro64/Makefile
+++ b/sysutils/u-boot-rockpro64/Makefile
@@ -2,6 +2,8 @@
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+U_BOOT_SLAVE_PORTREVISION_2020.10=	1
+
 EXTRA_PATCHES=	${.CURDIR}/files
 
 MODEL=		rockpro64
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
@@ -2,6 +2,8 @@
 
 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 577130b871f8..3120d997346a 100644
--- a/sysutils/u-boot-sopine/Makefile
+++ b/sysutils/u-boot-sopine/Makefile
@@ -2,6 +2,8 @@
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+U_BOOT_SLAVE_PORTREVISION_2020.10=	1
+
 MODEL=		sopine
 BOARD_CONFIG=	sopine_baseboard_defconfig
 FAMILY=		allwinner64
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,7 +1,7 @@
 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