Index: stable/11/release/arm/RPI-B.conf
===================================================================
--- stable/11/release/arm/RPI-B.conf	(revision 355558)
+++ stable/11/release/arm/RPI-B.conf	(revision 355559)
@@ -1,52 +1,52 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 EMBEDDED_TARGET_ARCH="armv6"
 EMBEDDED_TARGET="arm"
 EMBEDDEDBUILD=1
 EMBEDDEDPORTS="sysutils/u-boot-rpi sysutils/rpi-firmware"
 FAT_SIZE="50m"
 FAT_TYPE="16"
 IMAGE_SIZE="3072M"
 KERNEL="RPI-B"
 MD_ARGS="-x 63 -y 255"
 NODOC=1
 UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi"
 RPI_FIRMWARE_DIR="/usr/local/share/rpi-firmware"
 OL_DIR="${RPI_FIRMWARE_DIR}/overlays"
-OVERLAYS="mmc.dtbo pi3-disable-bt.dtbo"
+OVERLAYS="mmc.dtbo disable-bt.dtbo"
 PART_SCHEME="MBR"
 WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x2000000"
 
 arm_install_uboot() {
 	UBOOT_FILES="u-boot.bin"
 	RPI_FIRMWARE_FILES="bootcode.bin config.txt \
 		fixup.dat fixup_cd.dat fixup_db.dat fixup_x.dat \
 		start.elf start_cd.elf start_db.elf start_x.elf \
-		bcm2708-rpi-0-w.dtb bcm2708-rpi-b-plus.dtb bcm2708-rpi-b.dtb \
-		bcm2708-rpi-cm.dtb"
+		bcm2708-rpi-zero-w.dtb bcm2708-rpi-b-plus.dtb \
+		bcm2708-rpi-b.dtb bcm2708-rpi-cm.dtb"
 	FATMOUNT="${DESTDIR%${KERNEL}}/fat"
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
 	for _UF in ${UBOOT_FILES}; do
 		chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/${_UF} \
 			${FATMOUNT}/${_UF}
 	done
 	for _UF in ${RPI_FIRMWARE_FILES}; do
 		chroot ${CHROOTDIR} cp -p ${RPI_FIRMWARE_DIR}/${_UF} \
 			${FATMOUNT}/${_UF}
 	done
 	chroot ${CHROOTDIR} mkdir -p ${FATMOUNT}/overlays
 	for _OL in ${OVERLAYS}; do
 		chroot ${CHROOTDIR} cp -p ${OL_DIR}/${_OL} \
 			${FATMOUNT}/overlays/${_OL}
 	done
 	chroot ${CHROOTDIR} cp ${UBOOT_DIR}/boot.scr ${FATMOUNT}/boot.scr
 	sync
 	umount_loop ${CHROOTDIR}/${FATMOUNT}
 	chroot ${CHROOTDIR} rmdir ${FATMOUNT}
 	
 	return 0
 }
Index: stable/11
===================================================================
--- stable/11	(revision 355558)
+++ stable/11	(revision 355559)

Property changes on: stable/11
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r355424
Index: stable/12/release/arm/RPI-B.conf
===================================================================
--- stable/12/release/arm/RPI-B.conf	(revision 355558)
+++ stable/12/release/arm/RPI-B.conf	(revision 355559)
@@ -1,51 +1,51 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 EMBEDDED_TARGET_ARCH="armv6"
 EMBEDDED_TARGET="arm"
 EMBEDDEDBUILD=1
 EMBEDDEDPORTS="sysutils/u-boot-rpi sysutils/rpi-firmware"
 FAT_SIZE="50m"
 FAT_TYPE="16"
 IMAGE_SIZE="3072M"
 KERNEL="RPI-B"
 MD_ARGS="-x 63 -y 255"
 NODOC=1
 UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi"
 RPI_FIRMWARE_DIR="/usr/local/share/rpi-firmware"
 OL_DIR="${RPI_FIRMWARE_DIR}/overlays"
-OVERLAYS="mmc.dtbo pi3-disable-bt.dtbo"
+OVERLAYS="mmc.dtbo disable-bt.dtbo"
 PART_SCHEME="MBR"
 export BOARDNAME="RPI-B"
 
 arm_install_uboot() {
 	UBOOT_FILES="u-boot.bin"
 	RPI_FIRMWARE_FILES="bootcode.bin config.txt \
 		fixup.dat fixup_cd.dat fixup_db.dat fixup_x.dat \
 		start.elf start_cd.elf start_db.elf start_x.elf \
-		bcm2708-rpi-0-w.dtb bcm2708-rpi-b-plus.dtb bcm2708-rpi-b.dtb \
-		bcm2708-rpi-cm.dtb"
+		bcm2708-rpi-zero-w.dtb bcm2708-rpi-b-plus.dtb \
+		bcm2708-rpi-b.dtb bcm2708-rpi-cm.dtb"
 	FATMOUNT="${DESTDIR%${KERNEL}}/fat"
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
 	for _UF in ${UBOOT_FILES}; do
 		chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/${_UF} \
 			${FATMOUNT}/${_UF}
 	done
 	for _UF in ${RPI_FIRMWARE_FILES}; do
 		chroot ${CHROOTDIR} cp -p ${RPI_FIRMWARE_DIR}/${_UF} \
 			${FATMOUNT}/${_UF}
 	done
 	chroot ${CHROOTDIR} mkdir -p ${FATMOUNT}/overlays
 	for _OL in ${OVERLAYS}; do
 		chroot ${CHROOTDIR} cp -p ${OL_DIR}/${_OL} \
 			${FATMOUNT}/overlays/${_OL}
 	done
 	sync
 	umount_loop ${CHROOTDIR}/${FATMOUNT}
 	chroot ${CHROOTDIR} rmdir ${FATMOUNT}
 	
 	return 0
 }
Index: stable/12/release/arm64/RPI3.conf
===================================================================
--- stable/12/release/arm64/RPI3.conf	(revision 355558)
+++ stable/12/release/arm64/RPI3.conf	(revision 355559)
@@ -1,53 +1,55 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 DTB_DIR="/usr/local/share/rpi-firmware"
-DTB="bcm2710-rpi-3-b.dtb bcm2710-rpi-3-b-plus.dtb"
+DTB="bcm2710-rpi-3-b.dtb bcm2710-rpi-3-b-plus.dtb bcm2711-rpi-4-b.dtb"
 EMBEDDED_TARGET_ARCH="aarch64"
 EMBEDDED_TARGET="arm64"
 EMBEDDEDBUILD=1
 EMBEDDEDPORTS="sysutils/u-boot-rpi3 sysutils/rpi-firmware"
 FAT_SIZE="50m -b 1m"
 FAT_TYPE="16"
 IMAGE_SIZE="3072M"
 KERNEL="GENERIC"
 MD_ARGS="-x 63 -y 255"
 NODOC=1
 OL_DIR="${DTB_DIR}/overlays"
-OVERLAYS="mmc.dtbo pwm.dtbo pi3-disable-bt.dtbo"
+OVERLAYS="mmc.dtbo pwm.dtbo disable-bt.dtbo"
 PART_SCHEME="MBR"
 export BOARDNAME="RPI3"
 
 arm_install_uboot() {
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi3"
 	UBOOT_FILES="README u-boot.bin"
-	DTB_FILES="armstub8.bin bootcode.bin fixup_cd.dat \
+	DTB_FILES="armstub8.bin armstub8-gic.bin bootcode.bin fixup_cd.dat \
 		fixup_db.dat fixup_x.dat fixup.dat LICENCE.broadcom \
 		start_cd.elf start_db.elf start_x.elf start.elf ${DTB}"
 	FATMOUNT="${DESTDIR%${KERNEL}}fat"
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
 	for _UF in ${UBOOT_FILES}; do
 		chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/${_UF} \
 			${FATMOUNT}/${_UF}
 	done
 	for _DF in ${DTB_FILES}; do
 		chroot ${CHROOTDIR} cp -p ${DTB_DIR}/${_DF} \
 			${FATMOUNT}/${_DF}
 	done
+	chroot ${CHROOTDIR} cp -p ${DTB_DIR}/config_rpi4.txt \
+			${FATMOUNT}
 	chroot ${CHROOTDIR} cp -p ${DTB_DIR}/config_rpi3.txt \
 			${FATMOUNT}/config.txt
 	chroot ${CHROOTDIR} mkdir -p ${FATMOUNT}/overlays
 	for _OL in ${OVERLAYS}; do
 		chroot ${CHROOTDIR} cp -p ${OL_DIR}/${_OL} \
 			${FATMOUNT}/overlays/${_OL}
 	done
 
 	sync
 	umount_loop ${CHROOTDIR}/${FATMOUNT}
 	chroot ${CHROOTDIR} rmdir ${FATMOUNT}
 	
 	return 0
 }
Index: stable/12
===================================================================
--- stable/12	(revision 355558)
+++ stable/12	(revision 355559)

Property changes on: stable/12
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r355424