diff --git a/conf/airframes/examples/quadrotor_lisa_mx.xml b/conf/airframes/examples/quadrotor_lisa_mx.xml
index dd3102daf3..1cf5bc6ee3 100644
--- a/conf/airframes/examples/quadrotor_lisa_mx.xml
+++ b/conf/airframes/examples/quadrotor_lisa_mx.xml
@@ -42,6 +42,11 @@
     <!--define name="KILL_ON_GROUND_DETECT" value="TRUE"/-->
   </firmware>
 
+  <firmware name="test_progs">
+    <target name="test_sys_time_timer" board="lisa_mx_2.0"/>
+    <target name="test_telemetry" board="lisa_mx_2.0"/>
+  </firmware>
+
   <modules>
     <load name="adc_generic.xml">
       <configure name="ADC_CHANNEL_GENERIC1" value="ADC_1"/>
diff --git a/conf/boards/booz_1.0.makefile b/conf/boards/booz_1.0.makefile
index 20058f06b2..ba14c85c18 100644
--- a/conf/boards/booz_1.0.makefile
+++ b/conf/boards/booz_1.0.makefile
@@ -8,9 +8,7 @@ BOARD=booz
 BOARD_VERSION=1.0
 BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
 
-ifndef FLASH_MODE
-FLASH_MODE = IAP
-endif
+FLASH_MODE ?= IAP
 
 #
 #
diff --git a/conf/boards/hb_1.1.makefile b/conf/boards/hb_1.1.makefile
index bce9b30cde..5f142cdf2f 100644
--- a/conf/boards/hb_1.1.makefile
+++ b/conf/boards/hb_1.1.makefile
@@ -8,9 +8,7 @@ BOARD=hb
 BOARD_VERSION=1.1
 BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
 
-ifndef FLASH_MODE
-FLASH_MODE = IAP
-endif
+FLASH_MODE ?= IAP
 
 #
 #
diff --git a/conf/boards/krooz_sd.makefile b/conf/boards/krooz_sd.makefile
index d5679f8539..237675493c 100644
--- a/conf/boards/krooz_sd.makefile
+++ b/conf/boards/krooz_sd.makefile
@@ -22,11 +22,9 @@ $(TARGET).LDSCRIPT=$(SRC_ARCH)/krooz.ld
 
 # -----------------------------------------------------------------------
 
-ifndef FLASH_MODE
-FLASH_MODE = DFU
-#FLASH_MODE = JTAG
-#FLASH_MODE = SERIAL
-endif
+# default flash mode is via usb dfu bootloader (luftboot)
+# other possibilities: DFU-UTIL, JTAG, SWD, STLINK, SERIAL
+FLASH_MODE ?= DFU
 
 DFU_ADDR = 0x8004000
 DFU_PRODUCT = any
diff --git a/conf/boards/lisa_mx_2.0.makefile b/conf/boards/lisa_mx_2.0.makefile
index 0fd3ee7ae0..4e1359ba1b 100644
--- a/conf/boards/lisa_mx_2.0.makefile
+++ b/conf/boards/lisa_mx_2.0.makefile
@@ -13,19 +13,14 @@ ARCH=stm32
 ARCH_L=f4
 HARD_FLOAT=yes
 $(TARGET).ARCHDIR = $(ARCH)
-# not needed?
-$(TARGET).OOCD_INTERFACE=flossjtag
-#$(TARGET).OOCD_INTERFACE=jtagkey-tiny
 $(TARGET).LDSCRIPT=$(SRC_ARCH)/lisa-mx.ld
 
 # -----------------------------------------------------------------------
 
 # default flash mode is via usb dfu bootloader (luftboot)
-# other possibilities: JTAG, SWD, SERIAL
-FLASH_MODE ?= DFU
+# other possibilities: DFU-UTIL, SWD, JTAG_BMP, STLINK, SERIAL
+FLASH_MODE ?= DFU-UTIL
 
-DFU_ADDR = 0x8004000
-DFU_PRODUCT = any
 
 #
 #
diff --git a/conf/boards/logom_2.6.makefile b/conf/boards/logom_2.6.makefile
index eaf515ef88..660b944cec 100644
--- a/conf/boards/logom_2.6.makefile
+++ b/conf/boards/logom_2.6.makefile
@@ -11,9 +11,7 @@ BOARD_VERSION=2.6
 
 BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
 
-ifndef FLASH_MODE
-FLASH_MODE = IAP
-endif
+FLASH_MODE ?= IAP
 
 
 LPC21ISP_BAUD = 38400
diff --git a/conf/boards/navgo_1.0.makefile b/conf/boards/navgo_1.0.makefile
index f5a35a373e..ca00d8f785 100644
--- a/conf/boards/navgo_1.0.makefile
+++ b/conf/boards/navgo_1.0.makefile
@@ -11,9 +11,7 @@ BOARD_VERSION=1.0
 
 BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
 
-ifndef FLASH_MODE
-FLASH_MODE = IAP
-endif
+FLASH_MODE ?= IAP
 
 
 LPC21ISP_BAUD = 38400
diff --git a/conf/boards/stm32f4_discovery.makefile b/conf/boards/stm32f4_discovery.makefile
index b0016fc9fd..4c392d9ab0 100644
--- a/conf/boards/stm32f4_discovery.makefile
+++ b/conf/boards/stm32f4_discovery.makefile
@@ -18,10 +18,8 @@ $(TARGET).LDSCRIPT=$(SRC_ARCH)/apogee.ld
 HARD_FLOAT=yes
 
 # default flash mode is via usb dfu bootloader
-# possibilities: DFU, SWD
-FLASH_MODE ?= DFU
-STLINK ?= n
-DFU_UTIL ?= y
+# possibilities: STLINK, DFU-UTIL, SWD, JTAG_BMP
+FLASH_MODE ?= STLINK
 
 #
 # default LED configuration
diff --git a/conf/flash_modes.xml b/conf/flash_modes.xml
index 9767eeda4d..4668cd1aca 100644
--- a/conf/flash_modes.xml
+++ b/conf/flash_modes.xml
@@ -52,6 +52,7 @@
     <boards>
       <board name="apogee_*"/>
       <board name="stm32f4_discovery"/>
+      <board name="lisa_mx*"/>
     </boards>
   </mode>
   <mode name="STLink (SWD)">