8 files changed, 16 insertions, 8 deletions
diff --git a/testhal/STM32/STM32F0xx/ADC/Makefile b/testhal/STM32/STM32F0xx/ADC/Makefile
index 6e9d24e71..c754ff09d 100644
--- a/testhal/STM32/STM32F0xx/ADC/Makefile
+++ b/testhal/STM32/STM32F0xx/ADC/Makefile
@@ -135,7 +135,8 @@ TCSRC =
 TCPPSRC =
 
 # List ASM source files here
-ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
+ASMSRC =
+ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
 
 INCDIR = $(CHIBIOS)/os/license \
          $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
diff --git a/testhal/STM32/STM32F0xx/CAN/Makefile b/testhal/STM32/STM32F0xx/CAN/Makefile
index 1beb7bf75..7ffed33a3 100644
--- a/testhal/STM32/STM32F0xx/CAN/Makefile
+++ b/testhal/STM32/STM32F0xx/CAN/Makefile
@@ -135,7 +135,8 @@ TCSRC =
 TCPPSRC =
 
 # List ASM source files here
-ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
+ASMSRC =
+ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
 
 INCDIR = $(CHIBIOS)/os/license \
          $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
diff --git a/testhal/STM32/STM32F0xx/EXT/Makefile b/testhal/STM32/STM32F0xx/EXT/Makefile
index 6e9d24e71..c754ff09d 100644
--- a/testhal/STM32/STM32F0xx/EXT/Makefile
+++ b/testhal/STM32/STM32F0xx/EXT/Makefile
@@ -135,7 +135,8 @@ TCSRC =
 TCPPSRC =
 
 # List ASM source files here
-ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
+ASMSRC =
+ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
 
 INCDIR = $(CHIBIOS)/os/license \
          $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
diff --git a/testhal/STM32/STM32F0xx/IRQ_STORM/Makefile b/testhal/STM32/STM32F0xx/IRQ_STORM/Makefile
index 6feab1e81..2736747ba 100644
--- a/testhal/STM32/STM32F0xx/IRQ_STORM/Makefile
+++ b/testhal/STM32/STM32F0xx/IRQ_STORM/Makefile
@@ -138,7 +138,8 @@ TCSRC =
 TCPPSRC =
 
 # List ASM source files here
-ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
+ASMSRC =
+ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
 
 INCDIR = $(CHIBIOS)/os/license \
          $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
diff --git a/testhal/STM32/STM32F0xx/PWM-ICU/Makefile b/testhal/STM32/STM32F0xx/PWM-ICU/Makefile
index 6e9d24e71..c754ff09d 100644
--- a/testhal/STM32/STM32F0xx/PWM-ICU/Makefile
+++ b/testhal/STM32/STM32F0xx/PWM-ICU/Makefile
@@ -135,7 +135,8 @@ TCSRC =
 TCPPSRC =
 
 # List ASM source files here
-ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
+ASMSRC =
+ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
 
 INCDIR = $(CHIBIOS)/os/license \
          $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
diff --git a/testhal/STM32/STM32F0xx/SPI/Makefile b/testhal/STM32/STM32F0xx/SPI/Makefile
index 6e9d24e71..c754ff09d 100644
--- a/testhal/STM32/STM32F0xx/SPI/Makefile
+++ b/testhal/STM32/STM32F0xx/SPI/Makefile
@@ -135,7 +135,8 @@ TCSRC =
 TCPPSRC =
 
 # List ASM source files here
-ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
+ASMSRC =
+ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
 
 INCDIR = $(CHIBIOS)/os/license \
          $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
diff --git a/testhal/STM32/STM32F0xx/UART/Makefile b/testhal/STM32/STM32F0xx/UART/Makefile
index 6e9d24e71..c754ff09d 100644
--- a/testhal/STM32/STM32F0xx/UART/Makefile
+++ b/testhal/STM32/STM32F0xx/UART/Makefile
@@ -135,7 +135,8 @@ TCSRC =
 TCPPSRC =
 
 # List ASM source files here
-ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
+ASMSRC =
+ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
 
 INCDIR = $(CHIBIOS)/os/license \
          $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
diff --git a/testhal/STM32/STM32F0xx/USB_CDC/Makefile b/testhal/STM32/STM32F0xx/USB_CDC/Makefile
index 4c3cd5cd9..0821212de 100644
--- a/testhal/STM32/STM32F0xx/USB_CDC/Makefile
+++ b/testhal/STM32/STM32F0xx/USB_CDC/Makefile
@@ -139,7 +139,8 @@ TCSRC =
 TCPPSRC =
 
 # List ASM source files here
-ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
+ASMSRC =
+ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
 
 INCDIR = $(CHIBIOS)/os/license \
          $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \