svn commit: r325862 - head/release/arm

[Emmanuel Vadot]

Author: manu
Date: Wed Nov 15 19:04:23 2017
New Revision: 325862
URL: https://svnweb.freebsd.org/changeset/base/325862

Log:
  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

Modified:
  head/release/arm/RPI2.conf

Modified: head/release/arm/RPI2.conf
==============================================================================
--- head/release/arm/RPI2.conf	Wed Nov 15 19:03:06 2017	(r325861)
+++ head/release/arm/RPI2.conf	Wed Nov 15 19:04:23 2017	(r325862)
@@ -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}"
@@ -27,6 +30,10 @@ arm_install_uboot() {
 	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
 	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} cp -p ${UFSMOUNT}/boot/ubldr.bin \