Index: user/gjb/thermite/11-armv6-CUBOX-HUMMINGBOARD-snap.conf
===================================================================
--- user/gjb/thermite/11-armv6-CUBOX-HUMMINGBOARD-snap.conf	(revision 316617)
+++ user/gjb/thermite/11-armv6-CUBOX-HUMMINGBOARD-snap.conf	(revision 316618)
@@ -1,62 +1,62 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 BUILDBRANCH="11"
 
 . "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf"
 
 export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release"
 
 EMBEDDED_TARGET_ARCH="armv6"
 EMBEDDED_TARGET="arm"
 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"
 NODOC=1
 NOPORTS=
 PART_SCHEME="MBR"
 WORLD_FLAGS="-j10"
 WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x12000000"
 export BOARDNAME="CUBOX-HUMMINGBOARD"
 
 export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}"
 export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
 
 load_stage_env() {
 	TARGET=${EMBEDDED_TARGET}
 	TARGET_ARCH=${EMBEDDED_TARGET_ARCH}
 }
 
 if [ ! -z ${FTP_STAGING} ]; then
 	load_stage_env
 fi
 
 arm_install_uboot() {
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-cubox-hummingboard"
 	UBOOT_FILES="u-boot.imx"
 	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}
 	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr
 	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \
 		${FATMOUNT}/ubldr.bin
 	chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
 	sync
 	umount_loop ${CHROOTDIR}/${FATMOUNT}
 	umount_loop ${CHROOTDIR}/${UFSMOUNT}
 	chroot ${CHROOTDIR} rmdir ${FATMOUNT}
 	chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
 	
 	return 0
 }
Index: user/gjb/thermite/11-armv6-WANDBOARD-snap.conf
===================================================================
--- user/gjb/thermite/11-armv6-WANDBOARD-snap.conf	(revision 316617)
+++ user/gjb/thermite/11-armv6-WANDBOARD-snap.conf	(revision 316618)
@@ -1,62 +1,62 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 BUILDBRANCH="11"
 
 . "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf"
 
 export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release"
 
 EMBEDDED_TARGET_ARCH="armv6"
 EMBEDDED_TARGET="arm"
 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"
 NODOC=1
 NOPORTS=
 PART_SCHEME="MBR"
 WORLD_FLAGS="-j10"
 WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x12000000"
 export BOARDNAME="WANDBOARD"
 
 export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}"
 export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
 
 load_stage_env() {
 	TARGET=${EMBEDDED_TARGET}
 	TARGET_ARCH=${EMBEDDED_TARGET_ARCH}
 }
 
 if [ ! -z ${FTP_STAGING} ]; then
 	load_stage_env
 fi
 
 arm_install_uboot() {
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-wandboard"
 	UBOOT_FILES="u-boot.imx"
 	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}
 	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr
 	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \
 		${FATMOUNT}/ubldr.bin
 	chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
 	sync
 	umount_loop ${CHROOTDIR}/${FATMOUNT}
 	umount_loop ${CHROOTDIR}/${UFSMOUNT}
 	chroot ${CHROOTDIR} rmdir ${FATMOUNT}
 	chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
 	
 	return 0
 }
Index: user/gjb/thermite/12-armv6-CUBOX-HUMMINGBOARD-snap.conf
===================================================================
--- user/gjb/thermite/12-armv6-CUBOX-HUMMINGBOARD-snap.conf	(revision 316617)
+++ user/gjb/thermite/12-armv6-CUBOX-HUMMINGBOARD-snap.conf	(revision 316618)
@@ -1,62 +1,62 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 BUILDBRANCH="12"
 
 . "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf"
 
 export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release"
 
 EMBEDDED_TARGET_ARCH="armv6"
 EMBEDDED_TARGET="arm"
 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"
 NODOC=1
 NOPORTS=
 PART_SCHEME="MBR"
 WORLD_FLAGS="-j10"
 WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x12000000"
 export BOARDNAME="CUBOX-HUMMINGBOARD"
 
 export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}"
 export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
 
 load_stage_env() {
 	TARGET=${EMBEDDED_TARGET}
 	TARGET_ARCH=${EMBEDDED_TARGET_ARCH}
 }
 
 if [ ! -z ${FTP_STAGING} ]; then
 	load_stage_env
 fi
 
 arm_install_uboot() {
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-cubox-hummingboard"
 	UBOOT_FILES="u-boot.imx"
 	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}
 	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr
 	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \
 		${FATMOUNT}/ubldr.bin
 	chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
 	sync
 	umount_loop ${CHROOTDIR}/${FATMOUNT}
 	umount_loop ${CHROOTDIR}/${UFSMOUNT}
 	chroot ${CHROOTDIR} rmdir ${FATMOUNT}
 	chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
 	
 	return 0
 }
Index: user/gjb/thermite/12-armv6-RPI2-snap.conf
===================================================================
--- user/gjb/thermite/12-armv6-RPI2-snap.conf	(revision 316617)
+++ user/gjb/thermite/12-armv6-RPI2-snap.conf	(revision 316618)
@@ -1,67 +1,67 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 BUILDBRANCH="12"
 
 . "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf"
 
 export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release"
 
 EMBEDDED_TARGET_ARCH="armv6"
 EMBEDDED_TARGET="arm"
 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"
 NODOC=1
 NOPORTS=
 PART_SCHEME="MBR"
 WORLD_FLAGS="-j10"
 WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x2000000"
 export BOARDNAME="RPI2"
 
 export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}"
 export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
 
 load_stage_env() {
 	TARGET=${EMBEDDED_TARGET}
 	TARGET_ARCH=${EMBEDDED_TARGET_ARCH}
 }
 
 if [ ! -z ${FTP_STAGING} ]; then
 	load_stage_env
 fi
 
 arm_install_uboot() {
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi2"
 	UBOOT_FILES="bootcode.bin config.txt fixup.dat fixup_cd.dat \
 		fixup_x.dat start.elf start_cd.elf start_x.elf u-boot.bin"
 	FATMOUNT="${DESTDIR%${KERNEL}}/fat"
 	UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
 	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
 	for _UF in ${UBOOT_FILES}; do
 		chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/${_UF} \
 			${FATMOUNT}/${_UF}
 	done
 	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr
 	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \
 		${FATMOUNT}/ubldr.bin
 	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/dtb/rpi2.dtb \
 		${FATMOUNT}/rpi2.dtb
 	chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
 	sync
 	umount_loop ${CHROOTDIR}/${FATMOUNT}
 	umount_loop ${CHROOTDIR}/${UFSMOUNT}
 	chroot ${CHROOTDIR} rmdir ${FATMOUNT}
 	chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
 	
 	return 0
 }
Index: user/gjb/thermite/12-armv6-WANDBOARD-snap.conf
===================================================================
--- user/gjb/thermite/12-armv6-WANDBOARD-snap.conf	(revision 316617)
+++ user/gjb/thermite/12-armv6-WANDBOARD-snap.conf	(revision 316618)
@@ -1,62 +1,62 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 BUILDBRANCH="12"
 
 . "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf"
 
 export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release"
 
 EMBEDDED_TARGET_ARCH="armv6"
 EMBEDDED_TARGET="arm"
 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"
 NODOC=1
 NOPORTS=
 PART_SCHEME="MBR"
 WORLD_FLAGS="-j10"
 WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x12000000"
 export BOARDNAME="WANDBOARD"
 
 export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}"
 export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
 
 load_stage_env() {
 	TARGET=${EMBEDDED_TARGET}
 	TARGET_ARCH=${EMBEDDED_TARGET_ARCH}
 }
 
 if [ ! -z ${FTP_STAGING} ]; then
 	load_stage_env
 fi
 
 arm_install_uboot() {
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-wandboard"
 	UBOOT_FILES="u-boot.imx"
 	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}
 	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr
 	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \
 		${FATMOUNT}/ubldr.bin
 	chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
 	sync
 	umount_loop ${CHROOTDIR}/${FATMOUNT}
 	umount_loop ${CHROOTDIR}/${UFSMOUNT}
 	chroot ${CHROOTDIR} rmdir ${FATMOUNT}
 	chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
 	
 	return 0
 }