svn commit: r288459 - head/release/arm

[Glen Barber]

Author: gjb
Date: Thu Oct  1 19:48:10 2015
New Revision: 288459
URL: https://svnweb.freebsd.org/changeset/base/288459

Log:
  Fix the path to the correct u-boot.bin file to write to
  the disk image, which fixes boot issues.
  
  Tested on:	BananaPi
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/arm/BANANAPI.conf
  head/release/arm/CUBIEBOARD.conf
  head/release/arm/CUBIEBOARD2.conf

Modified: head/release/arm/BANANAPI.conf
==============================================================================
--- head/release/arm/BANANAPI.conf	Thu Oct  1 19:07:15 2015	(r288458)
+++ head/release/arm/BANANAPI.conf	Thu Oct  1 19:48:10 2015	(r288459)
@@ -22,10 +22,8 @@ arm_install_uboot() {
 	UBOOT_FILES="u-boot.img"
 	FATMOUNT="${DESTDIR%${KERNEL}}/fat"
 	UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
-	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/sunxi-spl.bin \
-		of=/dev/${mddev} bs=1k seek=8
-	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
-		of=/dev/${mddev} bs=1k seek=40 conv=notrunc,sync
+	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/u-boot-sunxi-with-spl.bin \
+		of=/dev/${mddev} bs=1k seek=8 conv=sync
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
 	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}

Modified: head/release/arm/CUBIEBOARD.conf
==============================================================================
--- head/release/arm/CUBIEBOARD.conf	Thu Oct  1 19:07:15 2015	(r288458)
+++ head/release/arm/CUBIEBOARD.conf	Thu Oct  1 19:48:10 2015	(r288459)
@@ -21,10 +21,8 @@ arm_install_uboot() {
 	UBOOT_FILES="u-boot.img"
 	FATMOUNT="${DESTDIR%${KERNEL}}/fat"
 	UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
-	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/sunxi-spl.bin \
-		of=/dev/${mddev} bs=1k seek=8
-	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
-		of=/dev/${mddev} bs=1k seek=40 conv=notrunc,sync
+	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/u-boot-sunxi-with-spl.bin \
+		of=/dev/${mddev} bs=1k seek=8 conv=sync
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
 	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}

Modified: head/release/arm/CUBIEBOARD2.conf
==============================================================================
--- head/release/arm/CUBIEBOARD2.conf	Thu Oct  1 19:07:15 2015	(r288458)
+++ head/release/arm/CUBIEBOARD2.conf	Thu Oct  1 19:48:10 2015	(r288459)
@@ -22,10 +22,8 @@ arm_install_uboot() {
 	UBOOT_FILES="u-boot.img"
 	FATMOUNT="${DESTDIR%${KERNEL}}/fat"
 	UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
-	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/sunxi-spl.bin \
-		of=/dev/${mddev} bs=1k seek=8
-	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
-		of=/dev/${mddev} bs=1k seek=40 conv=notrunc,sync
+	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/u-boot-sunxi-with-spl.bin \
+		of=/dev/${mddev} bs=1k seek=8 conv=sync
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
 	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}