In arm_install_uboot(), mount both FAT and UFS partitions

in the empty DESTDIR, and update path names.
Copy the ubldr to the FAT partition. [1]

Spotted by:	andrew [1]
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Glen Barber 2015-05-07 18:00:12 +00:00
parent ab44589d80
commit 6bd844ae0d

View File

@ -18,15 +18,25 @@ MD_ARGS="-x 63 -y 255"
arm_install_uboot() {
UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-beaglebone"
FDT_DIR="${CHROOTDIR}/${WORLDIR}/sys/boot/fdt/dts/arm"
chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${DESTDIR}
cp -p ${UBOOT_DIR}/MLO ${CHROOTDIR}/${DESTDIR}/MLO
cp -p ${UBOOT_DIR}/u-boot.img ${CHROOTDIR}/${DESTDIR}/u-boot.img
cp -p ${FDT_DIR}/beaglebone.dts ${CHROOTDIR}/${DESTDIR}/bbone.dts
cp -p ${FDT_DIR}/beaglebone.dts ${CHROOTDIR}/${DESTDIR}/bbone.dtb
cp -p ${FDT_DIR}/beaglebone-black.dts ${CHROOTDIR}/${DESTDIR}/bboneblk.dts
cp -p ${FDT_DIR}/beaglebone-black.dts ${CHROOTDIR}/${DESTDIR}/bboneblk.dtb
touch ${CHROOTDIR}/${DESTDIR}/bb-uEnv.txt
umount_loop ${CHROOTDIR}/${DESTDIR}
FATMOUNT="${DESTDIR}/fat"
UFSMOUNT="${DESTDIR}/ufs"
mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
cp -p ${UBOOT_DIR}/MLO ${CHROOTDIR}/${FATMOUNT}/MLO
cp -p ${UBOOT_DIR}/u-boot.img ${CHROOTDIR}/${FATMOUNT}/u-boot.img
cp -p ${FDT_DIR}/beaglebone.dts ${CHROOTDIR}/${FATMOUNT}/bbone.dts
cp -p ${FDT_DIR}/beaglebone.dts ${CHROOTDIR}/${FATMOUNT}/bbone.dtb
cp -p ${FDT_DIR}/beaglebone-black.dts ${CHROOTDIR}/${FATMOUNT}/bboneblk.dts
cp -p ${FDT_DIR}/beaglebone-black.dts ${CHROOTDIR}/${FATMOUNT}/bboneblk.dtb
touch ${CHROOTDIR}/${FATMOUNT}/bb-uEnv.txt
cp -p ${CHROOTDIR}/${UFSMOUNT}/boot/ubldr \
${CHROOTDIR}/${FATMOUNT}/ubldr
sync
umount_loop ${CHROOTDIR}/${FATMOUNT}
umount_loop ${CHROOTDIR}/${UFSMOUNT}
rmdir ${CHROOTDIR}/${FATMOUNT}
rmdir ${CHROOTDIR}/${UFSMOUNT}
return 0
}