diff --git a/chip-fel-fastboot.sh b/chip-fel-fastboot.sh
new file mode 100755
index 0000000..3c38ff9
--- /dev/null
+++ b/chip-fel-fastboot.sh
@@ -0,0 +1,117 @@
+#!/bin/bash
+
+SCRIPTDIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+
+source $SCRIPTDIR/common.sh
+
+FEL=${FEL}
+
+echo "BUILDROOT_OUTPUT_DIR = $BUILDROOT_OUTPUT_DIR"
+
+NAND_ERASE_BB=false
+if [ "$1" == "erase-bb" ]; then
+	NAND_ERASE_BB=true
+fi
+
+PATH=$PATH:$BUILDROOT_OUTPUT_DIR/host/usr/bin
+TMPDIR=`mktemp -d -t chipflashXXXXXX`
+PADDED_SPL="$TMPDIR/sunxi-padded-spl"
+PADDED_SPL_SIZE=0
+UBOOT_SCRIPT="$TMPDIR/uboot.scr"
+UBOOT_SCRIPT_MEM_ADDR=0x43100000
+UBOOT_SCRIPT_SRC="$TMPDIR/uboot.cmds"
+SPL="$BUILDROOT_OUTPUT_DIR/images/sunxi-spl.bin"
+SPL_MEM_ADDR=0x43000000
+UBOOT="$BUILDROOT_OUTPUT_DIR/images/u-boot-dtb.bin"
+PADDED_UBOOT="$TMPDIR/padded-uboot"
+PADDED_UBOOT_SIZE=0xc0000
+UBOOT_MEM_ADDR=0x4a000000
+UBI="$BUILDROOT_OUTPUT_DIR/images/rootfs.ubi"
+UBI_MEM_ADDR=0x4b000000
+
+UBI_SIZE=`filesize $UBI | xargs printf "0x%08x"`
+
+prepare_images() {
+	local in=$SPL
+	local out=$PADDED_SPL
+
+	if [ -e $out ]; then
+		rm $out
+	fi
+
+	# The BROM cannot read 16K pages: it only reads 8k of data at most.
+	# Split the SPL image in 8k chunks and pad each chunk with 8k of random
+	# data to limit the impact of repeated patterns on the MLC chip.
+
+	dd if=$in of=$out bs=8k count=1 skip=0 conv=sync
+	dd if=/dev/urandom of=$out bs=8k count=1 seek=1 conv=sync
+	dd if=$in of=$out bs=8k count=1 skip=1 seek=2 conv=sync
+	dd if=/dev/urandom of=$out bs=8k count=1 seek=3 conv=sync
+	dd if=$in of=$out bs=8k count=1 skip=2 seek=4 conv=sync
+	dd if=/dev/urandom of=$out bs=8k count=1 seek=5 conv=sync
+	PADDED_SPL_SIZE=`filesize $out | xargs printf "0x%08x"`
+
+	# Align the u-boot image on a page boundary
+	dd if=$UBOOT of=$PADDED_UBOOT bs=16k conv=sync
+	UBOOT_SIZE=`filesize $PADDED_UBOOT | xargs printf "0x%08x"`
+	dd if=/dev/urandom of=$PADDED_UBOOT seek=$((UBOOT_SIZE / 0x4000)) bs=16k count=$(((PADDED_UBOOT_SIZE - UBOOT_SIZE) / 0x4000))
+}
+
+prepare_uboot_script() {
+	if [ "$NAND_ERASE_BB" = true ] ; then
+		echo "nand scrub -y 0x0 0x200000000" > $UBOOT_SCRIPT_SRC
+	else
+		echo "nand erase 0x0 0x200000000" > $UBOOT_SCRIPT_SRC
+	fi
+	echo "sunxi_nand config spl" >> $UBOOT_SCRIPT_SRC
+	echo "nand write $SPL_MEM_ADDR 0x0 $PADDED_SPL_SIZE" >> $UBOOT_SCRIPT_SRC
+	echo "nand write $SPL_MEM_ADDR 0x100000 $PADDED_SPL_SIZE" >> $UBOOT_SCRIPT_SRC
+	echo "nand write $SPL_MEM_ADDR 0x200000 $PADDED_SPL_SIZE" >> $UBOOT_SCRIPT_SRC
+	echo "nand write $SPL_MEM_ADDR 0x300000 $PADDED_SPL_SIZE" >> $UBOOT_SCRIPT_SRC
+	echo "nand write $SPL_MEM_ADDR 0x400000 $PADDED_SPL_SIZE" >> $UBOOT_SCRIPT_SRC
+	echo "nand write $SPL_MEM_ADDR 0x500000 $PADDED_SPL_SIZE" >> $UBOOT_SCRIPT_SRC
+	echo "nand write $SPL_MEM_ADDR 0x600000 $PADDED_SPL_SIZE" >> $UBOOT_SCRIPT_SRC
+	echo "nand write $SPL_MEM_ADDR 0x700000 $PADDED_SPL_SIZE" >> $UBOOT_SCRIPT_SRC
+	echo "sunxi_nand config default" >> $UBOOT_SCRIPT_SRC
+	echo "nand write $UBOOT_MEM_ADDR 0x800000 $PADDED_UBOOT_SIZE" >> $UBOOT_SCRIPT_SRC
+	echo "setenv bootargs root=ubi0:rootfs rootfstype=ubifs rw earlyprintk ubi.mtd=4" >> $UBOOT_SCRIPT_SRC
+	echo "setenv bootcmd 'source \${scriptaddr}; nand slc-mode on; mtdparts; ubi part UBI; ubifsmount ubi0:rootfs; ubifsload \$fdt_addr_r /boot/sun5i-r8-chip.dtb; ubifsload \$kernel_addr_r /boot/zImage; bootz \$kernel_addr_r - \$fdt_addr_r'" >> $UBOOT_SCRIPT_SRC
+	echo "saveenv" >> $UBOOT_SCRIPT_SRC
+
+  echo "echo going to fastboot mode" >>$UBOOT_SCRIPT_SRC
+  echo "fastboot" >>$UBOOT_SCRIPT_SRC
+  echo "echo " >>$UBOOT_SCRIPT_SRC
+  echo "echo " >>$UBOOT_SCRIPT_SRC
+  echo "echo *********************************************" >>$UBOOT_SCRIPT_SRC
+  echo "echo *****************[ SUCCESS ]*****************" >>$UBOOT_SCRIPT_SRC
+  echo "echo *********************************************" >>$UBOOT_SCRIPT_SRC
+  echo "echo " >>$UBOOT_SCRIPT_SRC
+  echo "echo " >>$UBOOT_SCRIPT_SRC
+
+	mkimage -A arm -T script -C none -n "flash CHIP" -d $UBOOT_SCRIPT_SRC $UBOOT_SCRIPT
+}
+
+echo == preparing images ==
+prepare_images
+prepare_uboot_script
+
+echo == upload the SPL to SRAM and execute it ==
+${FEL} spl $SPL
+
+sleep 1 # wait for DRAM initialization to complete
+
+echo == upload images ==
+${FEL} write $SPL_MEM_ADDR $PADDED_SPL
+${FEL} write $UBOOT_MEM_ADDR $PADDED_UBOOT
+
+${FEL} write $UBOOT_SCRIPT_MEM_ADDR $UBOOT_SCRIPT
+
+echo == execute the main u-boot binary ==
+${FEL} exe $UBOOT_MEM_ADDR
+
+echo == waiting for fastboot ==
+while [[ -z "$(fastboot devices)" ]]; do sleep 1; done
+fastboot -u flash UBI ${BUILDROOT_OUTPUT_DIR}/images/rootfs.ubi
+fastboot continue
+
+echo "stuff is in $TMPDIR"
diff --git a/chip-fel-flash.sh b/chip-fel-flash.sh
index 6ba5ddb..1c8d77f 100755
--- a/chip-fel-flash.sh
+++ b/chip-fel-flash.sh
@@ -77,6 +77,7 @@ prepare_uboot_script() {
 	echo "setenv bootargs root=ubi0:rootfs rootfstype=ubifs rw earlyprintk ubi.mtd=4" >> $UBOOT_SCRIPT_SRC
 	echo "setenv bootcmd 'source \${scriptaddr}; nand slc-mode on; mtdparts; ubi part UBI; ubifsmount ubi0:rootfs; ubifsload \$fdt_addr_r /boot/sun5i-r8-chip.dtb; ubifsload \$kernel_addr_r /boot/zImage; bootz \$kernel_addr_r - \$fdt_addr_r'" >> $UBOOT_SCRIPT_SRC
 	echo "saveenv" >> $UBOOT_SCRIPT_SRC
+
 	echo "nand slc-mode on" >> $UBOOT_SCRIPT_SRC
 	echo "nand write.trimffs $UBI_MEM_ADDR 0x1000000 $UBI_SIZE" >> $UBOOT_SCRIPT_SRC
 	echo "mw \${scriptaddr} 0x0" >> $UBOOT_SCRIPT_SRC
diff --git a/chip-update-firmware.sh b/chip-update-firmware.sh
index 3e2ae7a..b93faf3 100755
--- a/chip-update-firmware.sh
+++ b/chip-update-firmware.sh
@@ -3,6 +3,8 @@ FW_DIR="$(pwd)/.firmware"
 FW_IMAGE_DIR="${FW_DIR}/images"
 S3_URL="https://s3-ap-northeast-1.amazonaws.com/stak-images/firmware/chip/stable/latest"
 
+FLASH_SCRIPT=./chip-fel-flash.sh
+
 function require_directory {
 	if [[ ! -d "${1}" ]]; then
 		mkdir -p "${1}"
@@ -19,7 +21,7 @@ function cache_download {
 }
 
 
-while getopts ":u" opt; do
+while getopts ":u:f" opt; do
   case $opt in
     u)
       echo "updating cache"
@@ -27,6 +29,10 @@ while getopts ":u" opt; do
         rm -rf $FW_IMAGE_DIR
       fi
       ;;
+    f)
+      echo "fastboot enabled"
+      FLASH_SCRIPT=./chip-fel-fastboot.sh
+      ;;
     \?)
       echo "Invalid option: -$OPTARG" >&2
       exit 1
@@ -42,4 +48,5 @@ cache_download "${FW_IMAGE_DIR}" uboot-env.bin
 cache_download "${FW_IMAGE_DIR}" zImage
 cache_download "${FW_IMAGE_DIR}" u-boot-dtb.bin
 
-BUILDROOT_OUTPUT_DIR="${FW_DIR}" ./chip-fel-flash.sh
+BUILDROOT_OUTPUT_DIR="${FW_DIR}" ${FLASH_SCRIPT}
+