diff --git a/sysutils/u-boot-master/distinfo b/sysutils/u-boot-master/distinfo
index 0b57d0434eff..77609bffddd3 100644
--- a/sysutils/u-boot-master/distinfo
+++ b/sysutils/u-boot-master/distinfo
@@ -1,13 +1,15 @@
-TIMESTAMP = 1625655964
+TIMESTAMP = 1636485856
 SHA256 (u-boot/u-boot-2021.07.tar.bz2) = 312b7eeae44581d1362c3a3f02c28d806647756c82ba8c72241c7cdbe68ba77e
 SIZE (u-boot/u-boot-2021.07.tar.bz2) = 17275746
 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/1547145/raw) = 50c6280a5db419597de451be3e89a8660c9f913767af205a4add79a8db6b89ce
+SIZE (u-boot/1547145/raw) = 372
diff --git a/sysutils/u-boot-rpi-0-w/Makefile b/sysutils/u-boot-rpi-0-w/Makefile
index 37cd2a34ad81..267647371cd5 100644
--- a/sysutils/u-boot-rpi-0-w/Makefile
+++ b/sysutils/u-boot-rpi-0-w/Makefile
@@ -1,14 +1,17 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
-PATCHFILES+=	939129/raw
+U_BOOT_SLAVE_PORTREVISION_2021.07=	1
+
+PATCHFILES+=	939129/raw \
+		1547145/raw
 
 MODEL=		rpi-0-w
 BOARD_CONFIG=	rpi_0_w_defconfig
 FAMILY=		rpi
 
 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-arm64/Makefile b/sysutils/u-boot-rpi-arm64/Makefile
index 9e25dd915601..a314b98bc4f0 100644
--- a/sysutils/u-boot-rpi-arm64/Makefile
+++ b/sysutils/u-boot-rpi-arm64/Makefile
@@ -1,16 +1,19 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+U_BOOT_SLAVE_PORTREVISION_2021.07=	1
+
 EXTRA_PATCHES=	${.CURDIR}/files/
-PATCHFILES+=	939129/raw
+PATCHFILES+=	939129/raw \
+		1547145/raw
 
 MODEL=		rpi-arm64
 BOARD_CONFIG=	rpi_arm64_defconfig
 FAMILY=		rpi
 UBOOT_ARCH=	aarch64
 
 DEPENDS=	${LOCALBASE}/share/rpi-firmware/bootcode.bin:sysutils/rpi-firmware
 
 CONFIG_FRAGMENT=	${.CURDIR}/files/rpi_arm64_fragment
 FRAGMENT_NAME=	rpi_arm64_fragment
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-rpi/Makefile b/sysutils/u-boot-rpi/Makefile
index 52de21af33e1..da431f73c537 100644
--- a/sysutils/u-boot-rpi/Makefile
+++ b/sysutils/u-boot-rpi/Makefile
@@ -1,14 +1,17 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
-PATCHFILES+=	939129/raw
+U_BOOT_SLAVE_PORTREVISION_2021.07=	1
+
+PATCHFILES+=	939129/raw \
+		1547145/raw
 
 MODEL=		rpi
 BOARD_CONFIG=	rpi_defconfig
 FAMILY=		rpi
 
 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..f89bfe0dd914 100644
--- a/sysutils/u-boot-rpi2/Makefile
+++ b/sysutils/u-boot-rpi2/Makefile
@@ -1,14 +1,17 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
-PATCHFILES+=	939129/raw
+U_BOOT_SLAVE_PORTREVISION_2021.07=	1
+
+PATCHFILES+=	939129/raw \
+		1547145/raw
 
 MODEL=		rpi2
 BOARD_CONFIG=	rpi_2_defconfig
 FAMILY=		rpi
 
 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/Makefile b/sysutils/u-boot-rpi3/Makefile
index b708f98830b3..80839124f365 100644
--- a/sysutils/u-boot-rpi3/Makefile
+++ b/sysutils/u-boot-rpi3/Makefile
@@ -1,16 +1,19 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+U_BOOT_SLAVE_PORTREVISION_2021.07=	1
+
 EXTRA_PATCHES?=	${.CURDIR}/files/
-PATCHFILES+=	939129/raw
+PATCHFILES+=	939129/raw \
+		1547145/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}/../u-boot-rpi3/files/rpi3_fragment
 FRAGMENT_NAME=	rpi3_fragment
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-rpi4/Makefile b/sysutils/u-boot-rpi4/Makefile
index 676ca4a77ffd..11b2636a6cdf 100644
--- a/sysutils/u-boot-rpi4/Makefile
+++ b/sysutils/u-boot-rpi4/Makefile
@@ -1,16 +1,19 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+U_BOOT_SLAVE_PORTREVISION_2021.07=	1
+
 EXTRA_PATCHES=	${.CURDIR}/files/
-PATCHFILES+=	939129/raw
+PATCHFILES+=	939129/raw \
+		1547145/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"