diff --git a/chip-fel-fastboot.sh b/chip-fel-fastboot.sh
index 2298b1f..ab35269 100755
--- a/chip-fel-fastboot.sh
+++ b/chip-fel-fastboot.sh
@@ -81,12 +81,9 @@ prepare_uboot_script() {
   echo "echo going to fastboot mode" >>$UBOOT_SCRIPT_SRC
   echo "fastboot" >>$UBOOT_SCRIPT_SRC
   echo "echo " >>$UBOOT_SCRIPT_SRC
+  echo "echo *****************[ BOOT ]*****************" >>$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
+  echo "boot" >>$UBOOT_SCRIPT_SRC
 
 	mkimage -A arm -T script -C none -n "flash CHIP" -d $UBOOT_SCRIPT_SRC $UBOOT_SCRIPT
 }
diff --git a/chip-update-firmware.sh b/chip-update-firmware.sh
index 06ad8fc..2bef441 100755
--- a/chip-update-firmware.sh
+++ b/chip-update-firmware.sh
@@ -69,5 +69,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}" ${FLASH_SCRIPT}
+BUILDROOT_OUTPUT_DIR="${FW_DIR}" ${FLASH_SCRIPT} erase-bb
 exit $?
diff --git a/common.sh b/common.sh
index ba0f939..258f69f 100755
--- a/common.sh
+++ b/common.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-TIMEOUT=20
+TIMEOUT=30
 
 onMac() {
   if [ "$(uname)" == "Darwin" ]; then