svn commit: r316618 - user/gjb/thermite

[Glen Barber]

Author: gjb
Date: Fri Apr  7 17:00:36 2017
New Revision: 316618
URL: https://svnweb.freebsd.org/changeset/base/316618

Log:
  Chase r316617:
  
  - Increase the image size for RPI2 and IMX6-based boards from 1G
    to 1.5G.
  - Use the 'conv=sync' dd(1) option to fix writing the u-boot.imx
    file to the md(4) device for IMX6-based boards.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  user/gjb/thermite/11-armv6-CUBOX-HUMMINGBOARD-snap.conf
  user/gjb/thermite/11-armv6-WANDBOARD-snap.conf
  user/gjb/thermite/12-armv6-CUBOX-HUMMINGBOARD-snap.conf
  user/gjb/thermite/12-armv6-RPI2-snap.conf
  user/gjb/thermite/12-armv6-WANDBOARD-snap.conf

Modified: user/gjb/thermite/11-armv6-CUBOX-HUMMINGBOARD-snap.conf
==============================================================================
--- user/gjb/thermite/11-armv6-CUBOX-HUMMINGBOARD-snap.conf	Fri Apr  7 16:55:13 2017	(r316617)
+++ user/gjb/thermite/11-armv6-CUBOX-HUMMINGBOARD-snap.conf	Fri Apr  7 17:00:36 2017	(r316618)
@@ -15,7 +15,7 @@ EMBEDDEDBUILD=1
 EMBEDDEDPORTS="sysutils/u-boot-cubox-hummingboard"
 FAT_SIZE="50m -b 16384"
 FAT_TYPE="16"
-IMAGE_SIZE="1G"
+IMAGE_SIZE="1536M"
 KERNEL_FLAGS="-j6"
 KERNEL="IMX6"
 MD_ARGS="-x 63 -y 255"
@@ -44,7 +44,7 @@ arm_install_uboot() {
 	FATMOUNT="${DESTDIR%${KERNEL}}/fat"
 	UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
 	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
-		of=/dev/${mddev} bs=512 seek=2
+		of=/dev/${mddev} bs=512 seek=2 conv=sync
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
 	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}

Modified: user/gjb/thermite/11-armv6-WANDBOARD-snap.conf
==============================================================================
--- user/gjb/thermite/11-armv6-WANDBOARD-snap.conf	Fri Apr  7 16:55:13 2017	(r316617)
+++ user/gjb/thermite/11-armv6-WANDBOARD-snap.conf	Fri Apr  7 17:00:36 2017	(r316618)
@@ -15,7 +15,7 @@ EMBEDDEDBUILD=1
 EMBEDDEDPORTS="sysutils/u-boot-wandboard"
 FAT_SIZE="50m -b 16384"
 FAT_TYPE="16"
-IMAGE_SIZE="1G"
+IMAGE_SIZE="1536M"
 KERNEL_FLAGS="-j6"
 KERNEL="IMX6"
 MD_ARGS="-x 63 -y 255"
@@ -44,7 +44,7 @@ arm_install_uboot() {
 	FATMOUNT="${DESTDIR%${KERNEL}}/fat"
 	UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
 	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
-		of=/dev/${mddev} bs=512 seek=2
+		of=/dev/${mddev} bs=512 seek=2 conv=sync
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
 	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}

Modified: user/gjb/thermite/12-armv6-CUBOX-HUMMINGBOARD-snap.conf
==============================================================================
--- user/gjb/thermite/12-armv6-CUBOX-HUMMINGBOARD-snap.conf	Fri Apr  7 16:55:13 2017	(r316617)
+++ user/gjb/thermite/12-armv6-CUBOX-HUMMINGBOARD-snap.conf	Fri Apr  7 17:00:36 2017	(r316618)
@@ -15,7 +15,7 @@ EMBEDDEDBUILD=1
 EMBEDDEDPORTS="sysutils/u-boot-cubox-hummingboard"
 FAT_SIZE="50m -b 16384"
 FAT_TYPE="16"
-IMAGE_SIZE="1G"
+IMAGE_SIZE="1536M"
 KERNEL_FLAGS="-j6"
 KERNEL="IMX6"
 MD_ARGS="-x 63 -y 255"
@@ -44,7 +44,7 @@ arm_install_uboot() {
 	FATMOUNT="${DESTDIR%${KERNEL}}/fat"
 	UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
 	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
-		of=/dev/${mddev} bs=512 seek=2
+		of=/dev/${mddev} bs=512 seek=2 conv=sync
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
 	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}

Modified: user/gjb/thermite/12-armv6-RPI2-snap.conf
==============================================================================
--- user/gjb/thermite/12-armv6-RPI2-snap.conf	Fri Apr  7 16:55:13 2017	(r316617)
+++ user/gjb/thermite/12-armv6-RPI2-snap.conf	Fri Apr  7 17:00:36 2017	(r316618)
@@ -15,7 +15,7 @@ EMBEDDEDBUILD=1
 EMBEDDEDPORTS="sysutils/u-boot-rpi2"
 FAT_SIZE="50m"
 FAT_TYPE="16"
-IMAGE_SIZE="1G"
+IMAGE_SIZE="1536M"
 KERNEL_FLAGS="-j6"
 KERNEL="GENERIC"
 MD_ARGS="-x 63 -y 255"

Modified: user/gjb/thermite/12-armv6-WANDBOARD-snap.conf
==============================================================================
--- user/gjb/thermite/12-armv6-WANDBOARD-snap.conf	Fri Apr  7 16:55:13 2017	(r316617)
+++ user/gjb/thermite/12-armv6-WANDBOARD-snap.conf	Fri Apr  7 17:00:36 2017	(r316618)
@@ -15,7 +15,7 @@ EMBEDDEDBUILD=1
 EMBEDDEDPORTS="sysutils/u-boot-wandboard"
 FAT_SIZE="50m -b 16384"
 FAT_TYPE="16"
-IMAGE_SIZE="1G"
+IMAGE_SIZE="1536M"
 KERNEL_FLAGS="-j6"
 KERNEL="IMX6"
 MD_ARGS="-x 63 -y 255"
@@ -44,7 +44,7 @@ arm_install_uboot() {
 	FATMOUNT="${DESTDIR%${KERNEL}}/fat"
 	UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
 	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
-		of=/dev/${mddev} bs=512 seek=2
+		of=/dev/${mddev} bs=512 seek=2 conv=sync
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
 	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}