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

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

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

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