svn commit: r288908 - head/release/arm

[Glen Barber]

Author: gjb
Date: Tue Oct  6 01:05:07 2015
New Revision: 288908
URL: https://svnweb.freebsd.org/changeset/base/288908

Log:
  Use UBOOT_FILES in the dd(1) input file, as intended.
  
  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	Tue Oct  6 01:00:12 2015	(r288907)
+++ head/release/arm/BANANAPI.conf	Tue Oct  6 01:05:07 2015	(r288908)
@@ -19,10 +19,10 @@ export BOARDNAME="BANANAPI"
 
 arm_install_uboot() {
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-bananapi"
-	UBOOT_FILES="u-boot.img"
+	UBOOT_FILES="u-boot-sunxi-with-spl.bin"
 	FATMOUNT="${DESTDIR%${KERNEL}}/fat"
 	UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
-	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/u-boot-sunxi-with-spl.bin \
+	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
 		of=/dev/${mddev} bs=1k seek=8 conv=sync
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}

Modified: head/release/arm/CUBIEBOARD.conf
==============================================================================
--- head/release/arm/CUBIEBOARD.conf	Tue Oct  6 01:00:12 2015	(r288907)
+++ head/release/arm/CUBIEBOARD.conf	Tue Oct  6 01:05:07 2015	(r288908)
@@ -18,10 +18,10 @@ NODOC=1
 
 arm_install_uboot() {
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-cubieboard"
-	UBOOT_FILES="u-boot.img"
+	UBOOT_FILES="u-boot-sunxi-with-spl.bin"
 	FATMOUNT="${DESTDIR%${KERNEL}}/fat"
 	UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
-	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/u-boot-sunxi-with-spl.bin \
+	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
 		of=/dev/${mddev} bs=1k seek=8 conv=sync
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}

Modified: head/release/arm/CUBIEBOARD2.conf
==============================================================================
--- head/release/arm/CUBIEBOARD2.conf	Tue Oct  6 01:00:12 2015	(r288907)
+++ head/release/arm/CUBIEBOARD2.conf	Tue Oct  6 01:05:07 2015	(r288908)
@@ -19,10 +19,10 @@ export BOARDNAME="CUBIEBOARD2"
 
 arm_install_uboot() {
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-cubieboard2"
-	UBOOT_FILES="u-boot.img"
+	UBOOT_FILES="u-boot-sunxi-with-spl.bin"
 	FATMOUNT="${DESTDIR%${KERNEL}}/fat"
 	UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
-	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/u-boot-sunxi-with-spl.bin \
+	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
 		of=/dev/${mddev} bs=1k seek=8 conv=sync
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}