svn commit: r322666 - stable/10/release/arm

[Glen Barber]

Author: gjb
Date: Fri Aug 18 16:43:59 2017
New Revision: 322666
URL: https://svnweb.freebsd.org/changeset/base/322666

Log:
  Create hard links to the installed dtb files for the BEAGLEBONE [1]
  and WANDBOARD [2] images to fix a boot issue.
  
  This is a direct commit to stable/10, as the change is not needed
  for head and stable/11.
  
  Approved by:	re (marius)
  Help from:	manu [1], ian [2]
  Tested by:	gjb [1], ian [2]
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/release/arm/BEAGLEBONE.conf
  stable/10/release/arm/WANDBOARD.conf

Modified: stable/10/release/arm/BEAGLEBONE.conf
==============================================================================
--- stable/10/release/arm/BEAGLEBONE.conf	Fri Aug 18 16:42:58 2017	(r322665)
+++ stable/10/release/arm/BEAGLEBONE.conf	Fri Aug 18 16:43:59 2017	(r322666)
@@ -28,6 +28,10 @@ arm_install_uboot() {
 	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr
 	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \
 		${FATMOUNT}/ubldr.bin
+	chroot ${CHROOTDIR} ln ${UFSMOUNT}/boot/dtb/beaglebone.dtb \
+		${UFSMOUNT}/boot/dtb/am335x-bone.dtb
+	chroot ${CHROOTDIR} ln ${UFSMOUNT}/boot/dtb/beaglebone-black.dtb \
+		${UFSMOUNT}/boot/dtb/am335x-boneblack.dtb
 	chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
 	sync
 	umount_loop ${CHROOTDIR}/${FATMOUNT}

Modified: stable/10/release/arm/WANDBOARD.conf
==============================================================================
--- stable/10/release/arm/WANDBOARD.conf	Fri Aug 18 16:42:58 2017	(r322665)
+++ stable/10/release/arm/WANDBOARD.conf	Fri Aug 18 16:43:59 2017	(r322666)
@@ -31,6 +31,10 @@ arm_install_uboot() {
 	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr
 	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \
 		${FATMOUNT}/ubldr.bin
+	chroot ${CHROOTDIR} ln ${UFSMOUNT}/boot/dtb/imx6dl-wandboard.dtb \
+		${UFSMOUNT}/boot/dtb/imx6dl-wandboard-revb1.dtb
+	chroot ${CHROOTDIR} ln ${UFSMOUNT}/boot/dtb/imx6q-wandboard.dtb
+		${UFSMOUNT}/boot/dtb/imx6q-wandboard-revb1.dtb
 	chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
 	sync
 	umount_loop ${CHROOTDIR}/${FATMOUNT}