diff options
author | Glen Barber <gjb@FreeBSD.org> | 2015-10-01 01:50:20 +0000 |
---|---|---|
committer | Glen Barber <gjb@FreeBSD.org> | 2015-10-01 01:50:20 +0000 |
commit | 3afa6e6c4b46c56fb0e41819f2ec7a97dd414e66 (patch) | |
tree | e34997900334a02d7250bd4c99c87ff1c24bc8a8 /release/arm | |
parent | 869cbfdb71c4bed07785820e29c93cdda442e50a (diff) | |
download | src-3afa6e6c4b46c56fb0e41819f2ec7a97dd414e66.tar.gz src-3afa6e6c4b46c56fb0e41819f2ec7a97dd414e66.zip |
Partially revert r288433, with a minor change:
Spell 'k' correctly.
Spotted by: loos (thank you!)
Sponsored by: The FreeBSD Foundation
Notes
Notes:
svn path=/head/; revision=288436
Diffstat (limited to 'release/arm')
-rw-r--r-- | release/arm/BANANAPI.conf | 6 | ||||
-rw-r--r-- | release/arm/CUBIEBOARD.conf | 6 | ||||
-rw-r--r-- | 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} |