diff --git a/sysutils/u-boot-rpi2/Makefile b/sysutils/u-boot-rpi2/Makefile
index d11d15970b04..e0d7bdf5b101 100644
--- a/sysutils/u-boot-rpi2/Makefile
+++ b/sysutils/u-boot-rpi2/Makefile
@@ -1,16 +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
+U_BOOT_SLAVE_PORTREVISION_2021.07=	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-rpi2/files/rpi2_fragment b/sysutils/u-boot-rpi2/files/rpi2_fragment
index 6978250aac7c..e5849534639e 100644
--- a/sysutils/u-boot-rpi2/files/rpi2_fragment
+++ b/sysutils/u-boot-rpi2/files/rpi2_fragment
@@ -1,5 +1,4 @@
 CONFIG_OF_EMBED=n
 CONFIG_OF_BOARD=y
-CONFIG_API=y
 CONFIG_ARMV7_NONSEC=n
-CONFIG_CMD_CACHE=y
+CONFIG_EFI_GRUB_ARM32_WORKAROUND=y