Partially revert r288433, with a minor change:

Spell 'k' correctly.

Spotted by:	loos (thank you!)
Sponsored by:	The FreeBSD Foundation

diff --git a/release/arm/BANANAPI.conf b/release/arm/BANANAPI.conf
index aeec8424681255c16d127a8aad272c930c00a467..d304b8daa172247ccfb39d315089066da621bc84 100644 (file)
--- 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 dfe3c5c01b26e1ffa40fd44fd06831b01760f992..94b53a79e71369a0d27a6b28451c3687bdf1db0b 100644 (file)
--- 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 fd98e4963094d1c321f2e2bf89642f29f9d63e6f..c118c3452a1fe753eba3913e3f67333140b71d08 100644 (file)
--- 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}