diff --git a/conf/Makefile.stm32 b/conf/Makefile.stm32
index e2658e9e2f..c0dd83f234 100644
--- a/conf/Makefile.stm32
+++ b/conf/Makefile.stm32
@@ -48,37 +48,6 @@ OPT   = s
 #OPT   = 0
 
 
-PYTHON ?= $(shell which python)
-
-ifneq ($(BOARD_SERIAL),)
-OOCD_OPTIONS = -c "ft2232_serial $(BOARD_SERIAL)"
-endif
-
-LOADER ?= $(PAPARAZZI_SRC)/sw/tools/stm32loader/stm32loader.py
-
-ifndef $(TARGET).OOCD_INTERFACE
-OOCD_INTERFACE = lisa-l
-else
-OOCD_INTERFACE =  $($(TARGET).OOCD_INTERFACE)
-endif
-
-ifndef $(TARGET).OOCD_BOARD
-OOCD_BOARD = lisa-l
-else
-OOCD_BOARD =  $($(TARGET).OOCD_BOARD)
-endif
-
-# default: assume the luftboot bootloader is not used
-# if luftboot is used define HAS_LUFTBOOT to a value != 0
-OOCD_START_SECTOR = 0
-ASSUMING_LUFTBOOT = "no"
-ifdef HAS_LUFTBOOT
-$(shell echo luftboot: $(HAS_LUFTBOOT))
-ifneq ($(HAS_LUFTBOOT),0)
-OOCD_START_SECTOR = 4
-ASSUMING_LUFTBOOT = "yes"
-endif
-endif
 
 # input files
 SRCS = $($(TARGET).srcs)
diff --git a/conf/Makefile.stm32-upload b/conf/Makefile.stm32-upload
index 012157448a..9f2ced9aca 100644
--- a/conf/Makefile.stm32-upload
+++ b/conf/Makefile.stm32-upload
@@ -23,12 +23,27 @@
 # This is the common Makefile for STM32 upload rules
 #
 
+
+# default: assume the luftboot bootloader is not used
+# if luftboot is used define HAS_LUFTBOOT to a value != 0
+OOCD_START_SECTOR = 0
+ASSUMING_LUFTBOOT = "no"
+ifdef HAS_LUFTBOOT
+$(shell echo luftboot: $(HAS_LUFTBOOT))
+ifeq (,$(findstring $(HAS_LUFTBOOT),0 FALSE))
+OOCD_START_SECTOR = 4
+ASSUMING_LUFTBOOT = "yes"
+endif
+endif
+
+
 #
 # check which flash mode is configured
 #
 ifeq ($(FLASH_MODE),DFU)
 #
 # DFU flash mode paparazzi stm32_mem
+PYTHON ?= $(shell which python)
 ifdef DFU_ADDR
 DFU_ADDR_CMD = --addr=$(DFU_ADDR)
 endif
@@ -51,8 +66,10 @@ upload: $(OBJDIR)/$(TARGET).bin
 #
 # serial flash mode
 else ifeq ($(FLASH_MODE),SERIAL)
+LOADER ?= $(PAPARAZZI_SRC)/sw/tools/stm32loader/stm32loader.py
 upload: $(OBJDIR)/$(TARGET).bin
 	$(LOADER) -p /dev/ttyUSB0  -b 115200 -e -w -v $^
+
 #
 # JTAG flash mode
 else ifeq ($(FLASH_MODE),JTAG)
@@ -60,6 +77,21 @@ else ifeq ($(FLASH_MODE),JTAG)
 ifeq ($(BMP_PORT),)
 # normal jtag via OpenOCD
 OOCD ?= openocd
+ifneq ($(BOARD_SERIAL),)
+OOCD_OPTIONS = -c "ft2232_serial $(BOARD_SERIAL)"
+endif
+
+ifndef $(TARGET).OOCD_INTERFACE
+OOCD_INTERFACE = lisa-l
+else
+OOCD_INTERFACE =  $($(TARGET).OOCD_INTERFACE)
+endif
+
+ifndef $(TARGET).OOCD_BOARD
+OOCD_BOARD = lisa-l
+else
+OOCD_BOARD =  $($(TARGET).OOCD_BOARD)
+endif
 upload: $(OBJDIR)/$(TARGET).hex
 	@echo "Assuming luftboot bootloader: $(ASSUMING_LUFTBOOT)"
 	@echo "Using OOCD = $(OOCD)"
diff --git a/conf/boards/lia_1.1.makefile b/conf/boards/lia_1.1.makefile
index 0491e26c15..f0305d1eab 100644
--- a/conf/boards/lia_1.1.makefile
+++ b/conf/boards/lia_1.1.makefile
@@ -18,12 +18,11 @@ $(TARGET).LDSCRIPT=$(SRC_ARCH)/lisa-m.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
 
+HAS_LUFTBOOT ?= 1
 ifeq (,$(findstring $(HAS_LUFTBOOT),0 FALSE))
 $(TARGET).CFLAGS+=-DLUFTBOOT
 $(TARGET).LDFLAGS+=-Wl,-Ttext=0x8002000
diff --git a/conf/boards/lisa_m_2.0.makefile b/conf/boards/lisa_m_2.0.makefile
index eed0a97b1b..a01fd69016 100644
--- a/conf/boards/lisa_m_2.0.makefile
+++ b/conf/boards/lisa_m_2.0.makefile
@@ -19,7 +19,7 @@ $(TARGET).LDSCRIPT=$(SRC_ARCH)/lisa-m.ld
 # -----------------------------------------------------------------------
 
 # default flash mode is via usb dfu bootloader (luftboot)
-# other possibilities: JTAG, SWD, SERIAL
+# other possibilities: DFU-UTIL, JTAG, SWD, STLINK, SERIAL
 FLASH_MODE ?= DFU
 
 HAS_LUFTBOOT ?= 1