Index: head/sysutils/u-boot-rpi/Makefile
===================================================================
--- head/sysutils/u-boot-rpi/Makefile
+++ head/sysutils/u-boot-rpi/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+MAINTAINER=	manu@FreeBSD.org
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		rpi
@@ -8,7 +9,10 @@
 
 DEPENDS=	${LOCALBASE}/share/rpi-firmware/bootcode.bin:sysutils/rpi-firmware
 
+PATCHFILES+=	937869/mbox/?	\
+		939129/mbox/?
+
+CONFIG_FRAGMENT=	${.CURDIR}/files/rpi_fragment
 FRAGMENT_NAME=		rpi_fragment
-CONFIG_FRAGMENT=	${.CURDIR}/files/${FRAGMENT_NAME}
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-rpi/files/patch-include_configs_rpi.h
===================================================================
--- head/sysutils/u-boot-rpi/files/patch-include_configs_rpi.h
+++ head/sysutils/u-boot-rpi/files/patch-include_configs_rpi.h
@@ -1,19 +0,0 @@
---- include/configs/rpi.h.orig	2018-07-09 14:24:14 UTC
-+++ include/configs/rpi.h
-@@ -69,6 +69,8 @@
- #define CONFIG_MISC_INIT_R
- #endif
- 
-+#define CONFIG_SYS_MMC_MAX_DEVICE	2
-+
- /* Console configuration */
- #define CONFIG_SYS_CBSIZE		1024
- 
-@@ -150,6 +152,7 @@
- 
- #define BOOT_TARGET_DEVICES(func) \
- 	func(MMC, mmc, 0) \
-+	func(MMC, mmc, 1) \
- 	func(USB, usb, 0) \
- 	func(PXE, pxe, na) \
- 	func(DHCP, dhcp, na)
Index: head/sysutils/u-boot-rpi2/Makefile
===================================================================
--- head/sysutils/u-boot-rpi2/Makefile
+++ head/sysutils/u-boot-rpi2/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+MAINTAINER=	manu@FreeBSD.org
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		rpi2
@@ -8,7 +9,10 @@
 
 DEPENDS=	${LOCALBASE}/share/rpi-firmware/bootcode.bin:sysutils/rpi-firmware
 
-FRAGMENT_NAME=		rpi2_fragment
-CONFIG_FRAGMENT=	${.CURDIR}/files/${FRAGMENT_NAME}
+PATCHFILES+=	937869/mbox/?	\
+		939129/mbox/?
+
+CONFIG_FRAGMENT=	${.CURDIR}/files/rpi2_fragment
+FRAGMENT_NAME=	rpi2_fragment
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-rpi2/files/patch-include_configs_rpi.h
===================================================================
--- head/sysutils/u-boot-rpi2/files/patch-include_configs_rpi.h
+++ head/sysutils/u-boot-rpi2/files/patch-include_configs_rpi.h
@@ -1,19 +0,0 @@
---- include/configs/rpi.h.orig	2018-07-09 14:24:14 UTC
-+++ include/configs/rpi.h
-@@ -69,6 +69,8 @@
- #define CONFIG_MISC_INIT_R
- #endif
- 
-+#define CONFIG_SYS_MMC_MAX_DEVICE	2
-+
- /* Console configuration */
- #define CONFIG_SYS_CBSIZE		1024
- 
-@@ -150,6 +152,7 @@
- 
- #define BOOT_TARGET_DEVICES(func) \
- 	func(MMC, mmc, 0) \
-+	func(MMC, mmc, 1) \
- 	func(USB, usb, 0) \
- 	func(PXE, pxe, na) \
- 	func(DHCP, dhcp, na)
Index: head/sysutils/u-boot-rpi3/Makefile
===================================================================
--- head/sysutils/u-boot-rpi3/Makefile
+++ head/sysutils/u-boot-rpi3/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+MAINTAINER=	uboot@FreeBSD.org
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		rpi3
@@ -9,7 +10,11 @@
 
 DEPENDS=	${LOCALBASE}/share/rpi-firmware/bootcode.bin:sysutils/rpi-firmware
 
-FRAGMENT_NAME=		rpi3_fragment
-CONFIG_FRAGMENT=	${.CURDIR}/files/${FRAGMENT_NAME}
+EXTRA_PATCHES=	${.CURDIR}/files/
+PATCHFILES+=	937869/mbox/?	\
+		939129/mbox/?
+
+CONFIG_FRAGMENT=	${.CURDIR}/files/rpi3_fragment
+FRAGMENT_NAME=	rpi3_fragment
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-rpi3/files/patch-include_configs_rpi.h
===================================================================
--- head/sysutils/u-boot-rpi3/files/patch-include_configs_rpi.h
+++ head/sysutils/u-boot-rpi3/files/patch-include_configs_rpi.h
@@ -1,19 +0,0 @@
---- include/configs/rpi.h.orig	2018-07-09 14:24:14 UTC
-+++ include/configs/rpi.h
-@@ -69,6 +69,8 @@
- #define CONFIG_MISC_INIT_R
- #endif
- 
-+#define CONFIG_SYS_MMC_MAX_DEVICE	2
-+
- /* Console configuration */
- #define CONFIG_SYS_CBSIZE		1024
- 
-@@ -150,6 +152,7 @@
- 
- #define BOOT_TARGET_DEVICES(func) \
- 	func(MMC, mmc, 0) \
-+	func(MMC, mmc, 1) \
- 	func(USB, usb, 0) \
- 	func(PXE, pxe, na) \
- 	func(DHCP, dhcp, na)