diff --git a/Tools/CPUInfo/CPUInfo.cpp b/Tools/CPUInfo/CPUInfo.cpp
index 73d1c6a45a..9802c9f93a 100644
--- a/Tools/CPUInfo/CPUInfo.cpp
+++ b/Tools/CPUInfo/CPUInfo.cpp
@@ -25,7 +25,7 @@ const AP_HAL::HAL& hal = AP_HAL::get_HAL();
 #if CONFIG_HAL_BOARD != HAL_BOARD_LINUX
 
 // On H750 we want to measure external flash to ram performance
-#if defined(EXT_FLASH_SIZE_MB) && defined(STM32H7)
+#if defined(EXT_FLASH_SIZE_MB) && EXT_FLASH_SIZE_MB>0 && defined(STM32H7)
 #define DISABLE_CACHES
 #endif
 
diff --git a/Tools/ardupilotwaf/chibios.py b/Tools/ardupilotwaf/chibios.py
index 63eeb0a42b..67920c4c3f 100644
--- a/Tools/ardupilotwaf/chibios.py
+++ b/Tools/ardupilotwaf/chibios.py
@@ -348,7 +348,7 @@ class generate_apj(Task.Task):
 class build_abin(Task.Task):
     '''build an abin file for skyviper firmware upload via web UI'''
     color='CYAN'
-    run_str='${TOOLS_SCRIPTS}/make_abin.sh ${SRC}.bin ${SRC}.abin'
+    run_str='${TOOLS_SCRIPTS}/make_abin.sh ${SRC} ${TGT}'
     always_run = True
     def keyword(self):
         return "Generating"
@@ -400,7 +400,7 @@ def chibios_firmware(self):
 
     if self.env.BUILD_ABIN:
         abin_target = self.bld.bldnode.find_or_declare('bin/' + link_output.change_ext('.abin').name)
-        abin_task = self.create_task('build_abin', src=link_output, tgt=abin_target)
+        abin_task = self.create_task('build_abin', src=bin_target, tgt=abin_target)
         abin_task.set_run_after(generate_apj_task)
 
     cleanup_task = self.create_task('build_normalized_bins', src=bin_target)
diff --git a/Tools/scripts/build_ci.sh b/Tools/scripts/build_ci.sh
index bc48d06d86..c4fa17d6c9 100755
--- a/Tools/scripts/build_ci.sh
+++ b/Tools/scripts/build_ci.sh
@@ -285,6 +285,8 @@ for t in $CI_BUILD_TARGET; do
         $waf configure --board Durandal
         $waf clean
         $waf copter
+        echo "Building CPUInfo"
+        $waf --target=tool/CPUInfo
 
         # test external flash build
         echo "Building SPRacingH7"
diff --git a/Tools/scripts/make_abin.sh b/Tools/scripts/make_abin.sh
index 96d6756281..8e903558bb 100755
--- a/Tools/scripts/make_abin.sh
+++ b/Tools/scripts/make_abin.sh
@@ -12,7 +12,7 @@ BINFILE="$1"
 ABINFILE="$2"
 
 [ -f "$BINFILE" ] || {
-    echo "Can't find bin file"
+    echo "Can't find bin file $BINFILE for abin"
     exit 1
 }