release: Update u-boot and firmware file for RPI2 target

The u-boot port for RPI-2 was updated to use u-boot-master, this cause
an update in u-boot version to v2017.09 and changing the filename.
The various firmware files for the RPI* are now in a common ports
sysutils/rpi-firmware as they are shared on all the RPI version.

Update the release files to copy the right files from the right location.

Reviewed by:	gjb
MFC after:	3 days

1 files changed, 10 insertions, 3 deletions

diff --git a/release/arm/RPI2.conf b/release/arm/RPI2.conf
index 0d2e5595e882..421f022427c3 100644
--- a/release/arm/RPI2.conf
+++ b/release/arm/RPI2.conf
@@ -6,7 +6,7 @@
 EMBEDDEDBUILD=1
 EMBEDDED_TARGET="arm"
 EMBEDDED_TARGET_ARCH="armv7"
-EMBEDDEDPORTS="sysutils/u-boot-rpi2"
+EMBEDDEDPORTS="sysutils/u-boot-rpi2 sysutils/rpi-firmware"
 KERNEL="GENERIC"
 IMAGE_SIZE="3072M"
 PART_SCHEME="MBR"
@@ -18,8 +18,11 @@ export BOARDNAME="RPI2"
 
 arm_install_uboot() {
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi2"
-	UBOOT_FILES="bootcode.bin config.txt fixup.dat fixup_cd.dat \
-		fixup_x.dat start.elf start_cd.elf start_x.elf u-boot.bin"
+	RPI_FIRMWARE_DIR="/usr/local/share/rpi-firmware"
+	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"
 	FATMOUNT="${DESTDIR%${KERNEL}}/fat"
 	UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
@@ -29,6 +32,10 @@ arm_install_uboot() {
 		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} cp -p ${UFSMOUNT}/boot/ubldr.bin \
 		${FATMOUNT}/ubldr.bin
 	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/dtb/rpi2.dtb \