svn commit: r288436 - head/release/arm

[Glen Barber]

Author: gjb
Date: Thu Oct  1 01:50:20 2015
New Revision: 288436
URL: https://svnweb.freebsd.org/changeset/base/288436

Log:
  Partially revert r288433, with a minor change:
  
  Spell 'k' correctly.
  
  Spotted by:	loos (thank you!)
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/arm/BANANAPI.conf
  head/release/arm/CUBIEBOARD.conf
  head/release/arm/CUBIEBOARD2.conf

Modified: head/release/arm/BANANAPI.conf
==============================================================================
--- head/release/arm/BANANAPI.conf	Thu Oct  1 00:47:30 2015	(r288435)
+++ head/release/arm/BANANAPI.conf	Thu Oct  1 01:50:20 2015	(r288436)
@@ -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}

Modified: head/release/arm/CUBIEBOARD.conf
==============================================================================
--- head/release/arm/CUBIEBOARD.conf	Thu Oct  1 00:47:30 2015	(r288435)
+++ head/release/arm/CUBIEBOARD.conf	Thu Oct  1 01:50:20 2015	(r288436)
@@ -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}

Modified: head/release/arm/CUBIEBOARD2.conf
==============================================================================
--- head/release/arm/CUBIEBOARD2.conf	Thu Oct  1 00:47:30 2015	(r288435)
+++ head/release/arm/CUBIEBOARD2.conf	Thu Oct  1 01:50:20 2015	(r288436)
@@ -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}