svn commit: r355559 - in stable: 11/release/arm 12/release/arm 12/release/arm64

[Kyle Evans]

Author: kevans
Date: Mon Dec  9 15:30:12 2019
New Revision: 355559
URL: https://svnweb.freebsd.org/changeset/base/355559

Log:
  MFC r355424: release: chase ports r519089 (rpi-firmware update)

Modified:
  stable/11/release/arm/RPI-B.conf
Directory Properties:
  stable/11/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/12/release/arm/RPI-B.conf
  stable/12/release/arm64/RPI3.conf
Directory Properties:
  stable/12/   (props changed)

Modified: stable/11/release/arm/RPI-B.conf
==============================================================================
--- stable/11/release/arm/RPI-B.conf	Mon Dec  9 15:23:05 2019	(r355558)
+++ stable/11/release/arm/RPI-B.conf	Mon Dec  9 15:30:12 2019	(r355559)
@@ -16,7 +16,7 @@ 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"
 
@@ -25,8 +25,8 @@ arm_install_uboot() {
 	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}