From 12a36c8cce7b9ec2e572dc0f69660e0c12138bfc Mon Sep 17 00:00:00 2001 From: Glen Barber Date: Thu, 1 Oct 2015 19:48:10 +0000 Subject: 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 --- release/arm/BANANAPI.conf | 6 ++---- release/arm/CUBIEBOARD.conf | 6 ++---- release/arm/CUBIEBOARD2.conf | 6 ++---- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/release/arm/BANANAPI.conf b/release/arm/BANANAPI.conf index d304b8daa172..48ade9c38d12 100644 --- 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 94b53a79e713..6aaef6270100 100644 --- 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 c118c3452a1f..6c449a1d9521 100644 --- 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} -- cgit v1.2.3