diff --git a/chip-fel-flash.sh b/chip-fel-flash.sh
index 9a1b0e9..5f25982 100755
--- a/chip-fel-flash.sh
+++ b/chip-fel-flash.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 SCRIPTDIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-
 source $SCRIPTDIR/common.sh
 
 FEL=fel
@@ -163,12 +162,4 @@ else
   fi
 fi
 
-if ! wait_for_linuxboot; then
-  echo "ERROR: could not flash"
-  rm -rf ${TMPDIR}
-  exit 1
-else
-  ${SCRIPTDIR}/verify.sh
-fi
-
 rm -rf ${TMPDIR}
diff --git a/chip-update-firmware.sh b/chip-update-firmware.sh
index cfb58a7..38c5fa9 100755
--- a/chip-update-firmware.sh
+++ b/chip-update-firmware.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+SCRIPTDIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+source $SCRIPTDIR/common.sh
+
 FLASH_SCRIPT=./chip-fel-flash.sh
 WHAT=buildroot
 BRANCH=stable
@@ -99,4 +102,13 @@ cache_download "${FW_IMAGE_DIR}" ${BR_URL} zImage
 cache_download "${FW_IMAGE_DIR}" ${BR_URL} u-boot-dtb.bin
 
 BUILDROOT_OUTPUT_DIR="${FW_DIR}" ${FLASH_SCRIPT} ${FLASH_SCRIPT_OPTION}
+
+if ! wait_for_linuxboot; then
+  echo "ERROR: could not flash"
+  rm -rf ${TMPDIR}
+  exit 1
+else
+  ${SCRIPTDIR}/verify.sh
+fi
+
 exit $?