aboutsummaryrefslogtreecommitdiff
path: root/release
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2015-05-07 18:00:12 +0000
committerGlen Barber <gjb@FreeBSD.org>2015-05-07 18:00:12 +0000
commit6bd844ae0ddca4a46a16df37c13dc95d8350bf56 (patch)
tree2c08044145a324a9ec1e56f7a02218c3e1470942 /release
parentab44589d807245e98975cae59b6ea8baf3910ff0 (diff)
downloadsrc-6bd844ae0ddca4a46a16df37c13dc95d8350bf56.tar.gz
src-6bd844ae0ddca4a46a16df37c13dc95d8350bf56.zip
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
Notes
Notes: svn path=/projects/release-arm-redux/; revision=282592
Diffstat (limited to 'release')
-rw-r--r--release/arm/BEAGLEBONE.conf28
1 files changed, 19 insertions, 9 deletions
diff --git a/release/arm/BEAGLEBONE.conf b/release/arm/BEAGLEBONE.conf
index 9845b152a35a..2b2c787929e5 100644
--- a/release/arm/BEAGLEBONE.conf
+++ b/release/arm/BEAGLEBONE.conf
@@ -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
}