From 3afa6e6c4b46c56fb0e41819f2ec7a97dd414e66 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 1 Oct 2015 01:50:20 +0000
Subject: [PATCH] Partially revert r288433, with a minor change:

Spell 'k' correctly.

Spotted by:	loos (thank you!)
Sponsored by:	The FreeBSD Foundation
---
 release/arm/BANANAPI.conf    | 6 +++---
 release/arm/CUBIEBOARD.conf  | 6 +++---
 release/arm/CUBIEBOARD2.conf | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/release/arm/BANANAPI.conf b/release/arm/BANANAPI.conf
index aeec84246812..d304b8daa172 100644
--- a/release/arm/BANANAPI.conf
+++ b/release/arm/BANANAPI.conf
@@ -11,7 +11,7 @@ KERNEL="A20"
 WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x42000000"
 IMAGE_SIZE="1G"
 PART_SCHEME="MBR"
-FAT_SIZE="32m"
+FAT_SIZE="32m -b 1m"
 FAT_TYPE="16"
 MD_ARGS="-x 63 -y 255"
 NODOC=1
@@ -23,9 +23,9 @@ arm_install_uboot() {
 	FATMOUNT="${DESTDIR%${KERNEL}}/fat"
 	UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
 	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/sunxi-spl.bin \
-		of=/dev/${mddev} bs=1m seek=8
+		of=/dev/${mddev} bs=1k seek=8
 	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
-		of=/dev/${mddev} bs=1m seek=40 conv=notrunc,sync
+		of=/dev/${mddev} bs=1k seek=40 conv=notrunc,sync
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
 	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
diff --git a/release/arm/CUBIEBOARD.conf b/release/arm/CUBIEBOARD.conf
index dfe3c5c01b26..94b53a79e713 100644
--- a/release/arm/CUBIEBOARD.conf
+++ b/release/arm/CUBIEBOARD.conf
@@ -11,7 +11,7 @@ KERNEL="CUBIEBOARD"
 WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x42000000"
 IMAGE_SIZE="1G"
 PART_SCHEME="MBR"
-FAT_SIZE="32m"
+FAT_SIZE="32m -b 1m"
 FAT_TYPE="16"
 MD_ARGS="-x 63 -y 255"
 NODOC=1
@@ -22,9 +22,9 @@ arm_install_uboot() {
 	FATMOUNT="${DESTDIR%${KERNEL}}/fat"
 	UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
 	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/sunxi-spl.bin \
-		of=/dev/${mddev} bs=1m seek=8
+		of=/dev/${mddev} bs=1k seek=8
 	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
-		of=/dev/${mddev} bs=1m seek=40 conv=notrunc,sync
+		of=/dev/${mddev} bs=1k seek=40 conv=notrunc,sync
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
 	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
diff --git a/release/arm/CUBIEBOARD2.conf b/release/arm/CUBIEBOARD2.conf
index fd98e4963094..c118c3452a1f 100644
--- a/release/arm/CUBIEBOARD2.conf
+++ b/release/arm/CUBIEBOARD2.conf
@@ -11,7 +11,7 @@ KERNEL="A20"
 WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x42000000"
 IMAGE_SIZE="1G"
 PART_SCHEME="MBR"
-FAT_SIZE="32m"
+FAT_SIZE="32m -b 1m"
 FAT_TYPE="16"
 MD_ARGS="-x 63 -y 255"
 NODOC=1
@@ -23,9 +23,9 @@ arm_install_uboot() {
 	FATMOUNT="${DESTDIR%${KERNEL}}/fat"
 	UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
 	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/sunxi-spl.bin \
-		of=/dev/${mddev} bs=1m seek=8
+		of=/dev/${mddev} bs=1k seek=8
 	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
-		of=/dev/${mddev} bs=1m seek=40 conv=notrunc,sync
+		of=/dev/${mddev} bs=1k seek=40 conv=notrunc,sync
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
 	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}