Use UBOOT_FILES in the dd(1) input file, as intended.

Sponsored by:	The FreeBSD Foundation

diff --git a/release/arm/BANANAPI.conf b/release/arm/BANANAPI.conf
index 48ade9c38d12412c469b3ac9d2e617aad8e631a3..15994f4d5e52b497c14a984048c73e7ae0fcedf4 100644 (file)
--- a/release/arm/BANANAPI.conf
+++ b/release/arm/BANANAPI.conf
@@ -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}

diff --git a/release/arm/CUBIEBOARD.conf b/release/arm/CUBIEBOARD.conf
index 6aaef6270100b2d0af83dd47854092a86a3741f3..f3bd0fb7e8918780987d49f636e36fb099089b92 100644 (file)
--- a/release/arm/CUBIEBOARD.conf
+++ b/release/arm/CUBIEBOARD.conf
@@ -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}

diff --git a/release/arm/CUBIEBOARD2.conf b/release/arm/CUBIEBOARD2.conf
index 6c449a1d952100afdce6f1e19b819fb55997a0a4..6b5a4acbd791adf01c2b7144904ed5f18002e217 100644 (file)
--- a/release/arm/CUBIEBOARD2.conf
+++ b/release/arm/CUBIEBOARD2.conf
@@ -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}