3c3
< # $FreeBSD: projects/release-arm-redux/release/arm/WANDBOARD.conf 282656 2015-05-08 18:55:09Z gjb $
---
> # $FreeBSD: head/release/arm/WANDBOARD.conf 282693 2015-05-09 21:08:12Z gjb $
20c20
< UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-wandboard"
---
> UBOOT_DIR="/usr/local/share/u-boot/u-boot-wandboard"
22,24c22,24
< FATMOUNT="${DESTDIR##${KERNEL}}/fat"
< UFSMOUNT="${DESTDIR##${KERNEL}}/ufs"
< chroot ${CHROOTDIR} dd if=${UBOOT_DIR##${CHROOTDIR}}/${UBOOT_FILES} \
---
> FATMOUNT="${DESTDIR%${KERNEL}}/fat"
> UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
> chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
29,34c29,33
< cp -p ${CHROOTDIR}/${UFSMOUNT}/boot/ubldr \
< ${CHROOTDIR}/${FATMOUNT}/ubldr
< chroot ${CHROOTDIR} echo \
< 'setenv fdt_file wandboard-quad.dtb; fatload mmc 0:1 11000000 ubldr; bootelf 11000000;' \
< > ${FATMOUNT}/boot.txt
< touch ${CHROOTDIR}/${UFSMOUNT}/firstboot
---
> chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr
> chroot ${CHROOTDIR} /bin/sh -c 'echo \
> setenv fdt_file wandboard-quad.dtb\; fatload mmc 0:1 11000000 ubldr\; bootelf 11000000\; \
> > ${FATMOUNT}/boot.txt'
> chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
38,39c37,38
< rmdir ${CHROOTDIR}/${FATMOUNT}
< rmdir ${CHROOTDIR}/${UFSMOUNT}
---
> chroot ${CHROOTDIR} rmdir ${FATMOUNT}
> chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
< # $FreeBSD: projects/release-arm-redux/release/arm/WANDBOARD.conf 282656 2015-05-08 18:55:09Z gjb $
---
> # $FreeBSD: head/release/arm/WANDBOARD.conf 282693 2015-05-09 21:08:12Z gjb $
20c20
< UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-wandboard"
---
> UBOOT_DIR="/usr/local/share/u-boot/u-boot-wandboard"
22,24c22,24
< FATMOUNT="${DESTDIR##${KERNEL}}/fat"
< UFSMOUNT="${DESTDIR##${KERNEL}}/ufs"
< chroot ${CHROOTDIR} dd if=${UBOOT_DIR##${CHROOTDIR}}/${UBOOT_FILES} \
---
> FATMOUNT="${DESTDIR%${KERNEL}}/fat"
> UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
> chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
29,34c29,33
< cp -p ${CHROOTDIR}/${UFSMOUNT}/boot/ubldr \
< ${CHROOTDIR}/${FATMOUNT}/ubldr
< chroot ${CHROOTDIR} echo \
< 'setenv fdt_file wandboard-quad.dtb; fatload mmc 0:1 11000000 ubldr; bootelf 11000000;' \
< > ${FATMOUNT}/boot.txt
< touch ${CHROOTDIR}/${UFSMOUNT}/firstboot
---
> chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr
> chroot ${CHROOTDIR} /bin/sh -c 'echo \
> setenv fdt_file wandboard-quad.dtb\; fatload mmc 0:1 11000000 ubldr\; bootelf 11000000\; \
> > ${FATMOUNT}/boot.txt'
> chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
38,39c37,38
< rmdir ${CHROOTDIR}/${FATMOUNT}
< rmdir ${CHROOTDIR}/${UFSMOUNT}
---
> chroot ${CHROOTDIR} rmdir ${FATMOUNT}
> chroot ${CHROOTDIR} rmdir ${UFSMOUNT}