Index: head/release/arm/BANANAPI.conf
===================================================================
--- head/release/arm/BANANAPI.conf
+++ head/release/arm/BANANAPI.conf
@@ -19,8 +19,15 @@
 arm_install_uboot() {
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-bananapi"
 	UBOOT_FILES="u-boot-sunxi-with-spl.bin"
+	FATMOUNT="${DESTDIR%${KERNEL}}/fat"
 	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
 		of=/dev/${mddev} bs=1k seek=8 conv=sync
-	
+	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}"
+	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
+	chroot ${CHROOTDIR} cp ${UBOOT_DIR}/boot.scr ${FATMOUNT}/boot.scr
+	sync
+	umount_loop ${CHROOTDIR}/${FATMOUNT}
+	chroot ${CHROOTDIR} rmdir ${FATMOUNT}
+
 	return 0
 }
Index: head/release/arm/BEAGLEBONE.conf
===================================================================
--- head/release/arm/BEAGLEBONE.conf
+++ head/release/arm/BEAGLEBONE.conf
@@ -27,6 +27,6 @@
 	sync
 	umount_loop ${CHROOTDIR}/${FATMOUNT}
 	chroot ${CHROOTDIR} rmdir ${FATMOUNT}
-	
+
 	return 0
 }
Index: head/release/arm/CUBIEBOARD.conf
===================================================================
--- head/release/arm/CUBIEBOARD.conf
+++ head/release/arm/CUBIEBOARD.conf
@@ -20,21 +20,14 @@
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-cubieboard"
 	UBOOT_FILES="u-boot-sunxi-with-spl.bin"
 	FATMOUNT="${DESTDIR%${KERNEL}}/fat"
-	UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
 	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
 		of=/dev/${mddev} bs=1k seek=8 conv=sync
-	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
+	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
 	chroot ${CHROOTDIR} cp ${UBOOT_DIR}/boot.scr ${FATMOUNT}/boot.scr
-	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
-	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: head/release/arm/CUBIEBOARD2.conf
===================================================================
--- head/release/arm/CUBIEBOARD2.conf
+++ head/release/arm/CUBIEBOARD2.conf
@@ -20,21 +20,14 @@
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-cubieboard2"
 	UBOOT_FILES="u-boot-sunxi-with-spl.bin"
 	FATMOUNT="${DESTDIR%${KERNEL}}/fat"
-	UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
 	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
 		of=/dev/${mddev} bs=1k seek=8 conv=sync
-	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
+	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
 	chroot ${CHROOTDIR} cp ${UBOOT_DIR}/boot.scr ${FATMOUNT}/boot.scr
-	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
-	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: head/release/arm/CUBOX-HUMMINGBOARD.conf
===================================================================
--- head/release/arm/CUBOX-HUMMINGBOARD.conf
+++ head/release/arm/CUBOX-HUMMINGBOARD.conf
@@ -20,21 +20,14 @@
 	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 conv=sync
-	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
+	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
 	chroot ${CHROOTDIR} cp ${UBOOT_DIR}/boot.scr ${FATMOUNT}/boot.scr
-	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
-	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: head/release/arm/PANDABOARD.conf
===================================================================
--- head/release/arm/PANDABOARD.conf
+++ head/release/arm/PANDABOARD.conf
@@ -19,21 +19,14 @@
 arm_install_uboot() {
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-pandaboard"
 	FATMOUNT="${DESTDIR%${KERNEL}}/fat"
-	UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
-	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
+	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
-	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
 	chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/MLO ${FATMOUNT}/MLO
 	chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/u-boot.img ${FATMOUNT}/u-boot.img
 	chroot ${CHROOTDIR} cp ${UBOOT_DIR}/boot.scr ${FATMOUNT}/boot.scr
-	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: head/release/arm/WANDBOARD.conf
===================================================================
--- head/release/arm/WANDBOARD.conf
+++ head/release/arm/WANDBOARD.conf
@@ -19,8 +19,15 @@
 arm_install_uboot() {
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-wandboard"
 	UBOOT_FILES="u-boot.imx"
+	FATMOUNT="${DESTDIR%${KERNEL}}/fat"
 	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
 		of=/dev/${mddev} bs=512 seek=2 conv=sync
-	
+	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}"
+	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
+	chroot ${CHROOTDIR} cp ${UBOOT_DIR}/boot.scr ${FATMOUNT}/boot.scr
+	sync
+	umount_loop ${CHROOTDIR}/${FATMOUNT}
+	chroot ${CHROOTDIR} rmdir ${FATMOUNT}
+
 	return 0
 }