svn commit: r332384 - head/release/arm64

[Glen Barber]

Author: gjb
Date: Tue Apr 10 17:40:44 2018
New Revision: 332384
URL: https://svnweb.freebsd.org/changeset/base/332384

Log:
  Following r331292, many of the files (such as the LICENSE file)
  have moved from the u-boot-rpi3 share directory to the default
  rpi-firmware share directory.  Remove the files from UBOOT_FILES
  and append the DTB file to a DTB_FILES list so the correct path
  is used, fixing a build failure.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/arm64/RPI3.conf

Modified: head/release/arm64/RPI3.conf
==============================================================================
--- head/release/arm64/RPI3.conf	Tue Apr 10 17:32:27 2018	(r332383)
+++ head/release/arm64/RPI3.conf	Tue Apr 10 17:40:44 2018	(r332384)
@@ -22,9 +22,10 @@ export BOARDNAME="RPI3"
 
 arm_install_uboot() {
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi3"
-	UBOOT_FILES="LICENCE.broadcom README armstub8.bin bootcode.bin config.txt \
-		fixup.dat fixup_cd.dat fixup_x.dat start.elf start_cd.elf \
-		start_x.elf u-boot.bin"
+	UBOOT_FILES="README u-boot.bin"
+	DTB_FILES="armstub8.bin bootcode.bin config.txt 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"
 	UFSMOUNT="${DESTDIR%${KERNEL}}ufs"
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
@@ -34,7 +35,10 @@ arm_install_uboot() {
 		chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/${_UF} \
 			${FATMOUNT}/${_UF}
 	done
-	chroot ${CHROOTDIR} cp -p ${DTB_DIR}/${DTB} ${FATMOUNT}/${DTB}
+	for _DF in ${DTB_FILES}; do
+		chroot ${CHROOTDIR} cp -p ${DTB_DIR}/${_DF} \
+			${FATMOUNT}/${_DF}
+	done
 	chroot ${CHROOTDIR} mkdir -p ${FATMOUNT}/overlays
 	for _OL in ${OVERLAYS}; do
 		chroot ${CHROOTDIR} cp -p ${OL_DIR}/${_OL} \