diff --git a/os/common/ports/ARM/compilers/GCC/mk/port_generic.mk b/os/common/ports/ARM/compilers/GCC/mk/port_generic.mk
index 9f0b2c8dd..71f269be6 100644
--- a/os/common/ports/ARM/compilers/GCC/mk/port_generic.mk
+++ b/os/common/ports/ARM/compilers/GCC/mk/port_generic.mk
@@ -7,6 +7,6 @@ PORTINC = ${CHIBIOS}/os/common/ports/ARM \
           ${CHIBIOS}/os/common/ports/ARM/compilers/GCC
 
 # Shared variables
-ALLASM  += $(PORTASM)
-ALLCSRC += $(PORTSRC)
-ALLINC  += $(PORTINC)
+ALLXASMSRC += $(PORTASM)
+ALLCSRC    += $(PORTSRC)
+ALLINC     += $(PORTINC)
diff --git a/os/common/ports/ARMCAx-TZ/compilers/GCC/mk/port_generic.mk b/os/common/ports/ARMCAx-TZ/compilers/GCC/mk/port_generic.mk
index 504d06d0b..98a0ca885 100644
--- a/os/common/ports/ARMCAx-TZ/compilers/GCC/mk/port_generic.mk
+++ b/os/common/ports/ARMCAx-TZ/compilers/GCC/mk/port_generic.mk
@@ -8,6 +8,6 @@ PORTINC = ${CHIBIOS}/os/common/ports/ARMCAx-TZ \
           ${CHIBIOS}/os/common/ports/ARMCAx-TZ/compilers/GCC
 
 # Shared variables
-ALLASM  += $(PORTASM)
-ALLCSRC += $(PORTSRC)
-ALLINC  += $(PORTINC)
+ALLXASMSRC += $(PORTASM)
+ALLCSRC    += $(PORTSRC)
+ALLINC     += $(PORTINC)
diff --git a/os/common/ports/ARMCMx/compilers/GCC/mk/port_v6m.mk b/os/common/ports/ARMCMx/compilers/GCC/mk/port_v6m.mk
index 68e9fd0c8..1fefa0441 100644
--- a/os/common/ports/ARMCMx/compilers/GCC/mk/port_v6m.mk
+++ b/os/common/ports/ARMCMx/compilers/GCC/mk/port_v6m.mk
@@ -8,6 +8,6 @@ PORTINC = $(CHIBIOS)/os/common/ports/ARMCMx \
           $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC
 
 # Shared variables
-ALLASM  += $(PORTASM)
-ALLCSRC += $(PORTSRC)
-ALLINC  += $(PORTINC)
+ALLXASMSRC += $(PORTASM)
+ALLCSRC    += $(PORTSRC)
+ALLINC     += $(PORTINC)
diff --git a/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk b/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
index fe139a286..fb89795e8 100644
--- a/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
+++ b/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
@@ -8,6 +8,6 @@ PORTINC = $(CHIBIOS)/os/common/ports/ARMCMx \
           $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC
 
 # Shared variables
-ALLASM  += $(PORTASM)
-ALLCSRC += $(PORTSRC)
-ALLINC  += $(PORTINC)
+ALLXASMSRC += $(PORTASM)
+ALLCSRC    += $(PORTSRC)
+ALLINC     += $(PORTINC)
diff --git a/os/common/ports/AVR/compilers/GCC/mk/port.mk b/os/common/ports/AVR/compilers/GCC/mk/port.mk
index 948335846..160b402ce 100644
--- a/os/common/ports/AVR/compilers/GCC/mk/port.mk
+++ b/os/common/ports/AVR/compilers/GCC/mk/port.mk
@@ -7,6 +7,6 @@ PORTINC = ${CHIBIOS}/os/common/ports/AVR \
           ${CHIBIOS}/os/common/ports/AVR/compilers/GCC
 
 # Shared variables
-ALLASM  += $(PORTASM)
-ALLCSRC += $(PORTSRC)
-ALLINC  += $(PORTINC)
+ALLXASMSRC += $(PORTASM)
+ALLCSRC    += $(PORTSRC)
+ALLINC     += $(PORTINC)
diff --git a/os/common/ports/SIMIA32/compilers/GCC/port.mk b/os/common/ports/SIMIA32/compilers/GCC/port.mk
index 524e422ff..f3657ee9d 100644
--- a/os/common/ports/SIMIA32/compilers/GCC/port.mk
+++ b/os/common/ports/SIMIA32/compilers/GCC/port.mk
@@ -7,6 +7,6 @@ PORTINC = ${CHIBIOS}/os/common/ports/SIMIA32/compilers/GCC \
           ${CHIBIOS}/os/common/ports/SIMIA32
 
 # Shared variables
-ALLASM  += $(PORTASM)
-ALLCSRC += $(PORTSRC)
-ALLINC  += $(PORTINC)
+ALLXASMSRC += $(PORTASM)
+ALLCSRC    += $(PORTSRC)
+ALLINC     += $(PORTINC)
diff --git a/os/common/ports/e200/compilers/GCC/mk/port.mk b/os/common/ports/e200/compilers/GCC/mk/port.mk
index 068961c67..063beb48c 100644
--- a/os/common/ports/e200/compilers/GCC/mk/port.mk
+++ b/os/common/ports/e200/compilers/GCC/mk/port.mk
@@ -8,6 +8,6 @@ PORTINC = $(CHIBIOS)/os/common/ports/e200 \
           $(CHIBIOS)/os/common/ports/e200/compilers/GCC
 
 # Shared variables
-ALLASM  += $(PORTASM)
-ALLCSRC += $(PORTSRC)
-ALLINC  += $(PORTINC)
+ALLXASMSRC += $(PORTASM)
+ALLCSRC    += $(PORTSRC)
+ALLINC     += $(PORTINC)
diff --git a/os/common/ports/e200/compilers/GHS/mk/port.mk b/os/common/ports/e200/compilers/GHS/mk/port.mk
index fab246dab..8e2cfffc6 100644
--- a/os/common/ports/e200/compilers/GHS/mk/port.mk
+++ b/os/common/ports/e200/compilers/GHS/mk/port.mk
@@ -8,6 +8,6 @@ PORTINC = $(CHIBIOS)/os/common/ports/e200 \
           $(CHIBIOS)/os/common/ports/e200/compilers/GHS
 
 # Shared variables
-ALLASM  += $(PORTASM)
-ALLCSRC += $(PORTSRC)
-ALLINC  += $(PORTINC)
+ALLXASMSRC += $(PORTASM)
+ALLCSRC    += $(PORTSRC)
+ALLINC     += $(PORTINC)
diff --git a/os/common/startup/ARM/compilers/GCC/mk/startup_lpc214x.mk b/os/common/startup/ARM/compilers/GCC/mk/startup_lpc214x.mk
index fb5b3fd69..3db0c0eb5 100644
--- a/os/common/startup/ARM/compilers/GCC/mk/startup_lpc214x.mk
+++ b/os/common/startup/ARM/compilers/GCC/mk/startup_lpc214x.mk
@@ -9,6 +9,6 @@ STARTUPINC = ${CHIBIOS}/os/common/startup/ARM/devices/LPC214x
 STARTUPLD  = ${CHIBIOS}/os/common/startup/ARM/compilers/GCC/ld
 
 # Shared variables
-ALLASM  += $(STARTUPASM)
-ALLCSRC += $(STARTUPSRC)
-ALLINC  += $(STARTUPINC)
+ALLXASMSRC += $(STARTUPASM)
+ALLCSRC    += $(STARTUPSRC)
+ALLINC     += $(STARTUPINC)
diff --git a/os/common/startup/ARM/compilers/GCC/mk/startup_sama5d2.mk b/os/common/startup/ARM/compilers/GCC/mk/startup_sama5d2.mk
index 269aad0b9..9ee6604b3 100755
--- a/os/common/startup/ARM/compilers/GCC/mk/startup_sama5d2.mk
+++ b/os/common/startup/ARM/compilers/GCC/mk/startup_sama5d2.mk
@@ -11,6 +11,6 @@ STARTUPINC = ${CHIBIOS}/os/common/startup/ARM/devices/SAMA5D2 \
 STARTUPLD  = ${CHIBIOS}/os/common/startup/ARM/compilers/GCC/ld
 
 # Shared variables
-ALLASM  += $(STARTUPASM)
-ALLCSRC += $(STARTUPSRC)
-ALLINC  += $(STARTUPINC)
+ALLXASMSRC += $(STARTUPASM)
+ALLCSRC    += $(STARTUPSRC)
+ALLINC     += $(STARTUPINC)
diff --git a/os/common/startup/ARMCAx-TZ/compilers/GCC/mk/startup_sama5d2.mk b/os/common/startup/ARMCAx-TZ/compilers/GCC/mk/startup_sama5d2.mk
index d5b4a22f4..43b2b78ec 100644
--- a/os/common/startup/ARMCAx-TZ/compilers/GCC/mk/startup_sama5d2.mk
+++ b/os/common/startup/ARMCAx-TZ/compilers/GCC/mk/startup_sama5d2.mk
@@ -11,6 +11,6 @@ STARTUPINC = ${CHIBIOS}/os/common/startup/ARMCAx-TZ/devices/SAMA5D2 \
 STARTUPLD  = ${CHIBIOS}/os/common/startup/ARMCAx-TZ/compilers/GCC/ld
 
 # Shared variables
-ALLASM  += $(STARTUPASM)
-ALLCSRC += $(STARTUPSRC)
-ALLINC  += $(STARTUPINC)
+ALLXASMSRC += $(STARTUPASM)
+ALLCSRC    += $(STARTUPSRC)
+ALLINC     += $(STARTUPINC)
diff --git a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f0xx.mk b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f0xx.mk
index b230f4232..48e705742 100644
--- a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f0xx.mk
+++ b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f0xx.mk
@@ -12,6 +12,6 @@ STARTUPINC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC \
 STARTUPLD  = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/ld
 
 # Shared variables
-ALLASM  += $(STARTUPASM)
-ALLCSRC += $(STARTUPSRC)
-ALLINC  += $(STARTUPINC)
+ALLXASMSRC += $(STARTUPASM)
+ALLCSRC    += $(STARTUPSRC)
+ALLINC     += $(STARTUPINC)
diff --git a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f1xx.mk b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f1xx.mk
index d68e06707..6cb329b4b 100644
--- a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f1xx.mk
+++ b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f1xx.mk
@@ -12,6 +12,6 @@ STARTUPINC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC \
 STARTUPLD  = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/ld
 
 # Shared variables
-ALLASM  += $(STARTUPASM)
-ALLCSRC += $(STARTUPSRC)
-ALLINC  += $(STARTUPINC)
+ALLXASMSRC += $(STARTUPASM)
+ALLCSRC    += $(STARTUPSRC)
+ALLINC     += $(STARTUPINC)
diff --git a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f2xx.mk b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f2xx.mk
index 7840d80b1..e216b5cb0 100644
--- a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f2xx.mk
+++ b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f2xx.mk
@@ -12,6 +12,6 @@ STARTUPINC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC \
 STARTUPLD  = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/ld
 
 # Shared variables
-ALLASM  += $(STARTUPASM)
-ALLCSRC += $(STARTUPSRC)
-ALLINC  += $(STARTUPINC)
+ALLXASMSRC += $(STARTUPASM)
+ALLCSRC    += $(STARTUPSRC)
+ALLINC     += $(STARTUPINC)
diff --git a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f3xx.mk b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f3xx.mk
index 4d7105e0a..454b4faa2 100644
--- a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f3xx.mk
+++ b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f3xx.mk
@@ -12,6 +12,6 @@ STARTUPINC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC \
 STARTUPLD  = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/ld
 
 # Shared variables
-ALLASM  += $(STARTUPASM)
-ALLCSRC += $(STARTUPSRC)
-ALLINC  += $(STARTUPINC)
+ALLXASMSRC += $(STARTUPASM)
+ALLCSRC    += $(STARTUPSRC)
+ALLINC     += $(STARTUPINC)
diff --git a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk
index a69a2c0eb..b78fecc01 100644
--- a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk
+++ b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk
@@ -12,6 +12,6 @@ STARTUPINC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC \
 STARTUPLD  = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/ld
 
 # Shared variables
-ALLASM  += $(STARTUPASM)
-ALLCSRC += $(STARTUPSRC)
-ALLINC  += $(STARTUPINC)
+ALLXASMSRC += $(STARTUPASM)
+ALLCSRC    += $(STARTUPSRC)
+ALLINC     += $(STARTUPINC)
diff --git a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f7xx.mk b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f7xx.mk
index 808c620bb..0f6bc77b8 100644
--- a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f7xx.mk
+++ b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f7xx.mk
@@ -12,6 +12,6 @@ STARTUPINC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC \
 STARTUPLD  = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/ld
 
 # Shared variables
-ALLASM  += $(STARTUPASM)
-ALLCSRC += $(STARTUPSRC)
-ALLINC  += $(STARTUPINC)
+ALLXASMSRC += $(STARTUPASM)
+ALLCSRC    += $(STARTUPSRC)
+ALLINC     += $(STARTUPINC)
diff --git a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32l0xx.mk b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32l0xx.mk
index ea596da3b..a1fd9ad0f 100644
--- a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32l0xx.mk
+++ b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32l0xx.mk
@@ -12,6 +12,6 @@ STARTUPINC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC \
 STARTUPLD  = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/ld
 
 # Shared variables
-ALLASM  += $(STARTUPASM)
-ALLCSRC += $(STARTUPSRC)
-ALLINC  += $(STARTUPINC)
+ALLXASMSRC += $(STARTUPASM)
+ALLCSRC    += $(STARTUPSRC)
+ALLINC     += $(STARTUPINC)
diff --git a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32l1xx.mk b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32l1xx.mk
index 4bd6f71fe..4c4c7e09b 100644
--- a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32l1xx.mk
+++ b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32l1xx.mk
@@ -12,6 +12,6 @@ STARTUPINC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC \
 STARTUPLD  = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/ld
 
 # Shared variables
-ALLASM  += $(STARTUPASM)
-ALLCSRC += $(STARTUPSRC)
-ALLINC  += $(STARTUPINC)
+ALLXASMSRC += $(STARTUPASM)
+ALLCSRC    += $(STARTUPSRC)
+ALLINC     += $(STARTUPINC)
diff --git a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32l4xx.mk b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32l4xx.mk
index e5e0fadd6..ce3f5fa47 100644
--- a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32l4xx.mk
+++ b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32l4xx.mk
@@ -12,6 +12,6 @@ STARTUPINC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC \
 STARTUPLD  = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/ld
 
 # Shared variables
-ALLASM  += $(STARTUPASM)
-ALLCSRC += $(STARTUPSRC)
-ALLINC  += $(STARTUPINC)
+ALLXASMSRC += $(STARTUPASM)
+ALLCSRC    += $(STARTUPSRC)
+ALLINC     += $(STARTUPINC)
diff --git a/os/common/startup/e200/compilers/GCC/mk/startup_spc560bcxx.mk b/os/common/startup/e200/compilers/GCC/mk/startup_spc560bcxx.mk
index c0a800b13..be464e51f 100644
--- a/os/common/startup/e200/compilers/GCC/mk/startup_spc560bcxx.mk
+++ b/os/common/startup/e200/compilers/GCC/mk/startup_spc560bcxx.mk
@@ -11,6 +11,6 @@ STARTUPINC = ${CHIBIOS}/os/common/startup/e200/compilers/GCC \
 STARTUPLD  = ${CHIBIOS}/os/common/startup/e200/compilers/GCC/ld
 
 # Shared variables
-ALLASM  += $(STARTUPASM)
-ALLCSRC += $(STARTUPSRC)
-ALLINC  += $(STARTUPINC)
+ALLXASMSRC += $(STARTUPASM)
+ALLCSRC    += $(STARTUPSRC)
+ALLINC     += $(STARTUPINC)
diff --git a/os/common/startup/e200/compilers/GCC/mk/startup_spc560bxx.mk b/os/common/startup/e200/compilers/GCC/mk/startup_spc560bxx.mk
index 7a514f717..e77fd5dbd 100644
--- a/os/common/startup/e200/compilers/GCC/mk/startup_spc560bxx.mk
+++ b/os/common/startup/e200/compilers/GCC/mk/startup_spc560bxx.mk
@@ -11,6 +11,6 @@ STARTUPINC = ${CHIBIOS}/os/common/startup/e200/compilers/GCC \
 STARTUPLD  = ${CHIBIOS}/os/common/startup/e200/compilers/GCC/ld
 
 # Shared variables
-ALLASM  += $(STARTUPASM)
-ALLCSRC += $(STARTUPSRC)
-ALLINC  += $(STARTUPINC)
+ALLXASMSRC += $(STARTUPASM)
+ALLCSRC    += $(STARTUPSRC)
+ALLINC     += $(STARTUPINC)
diff --git a/os/common/startup/e200/compilers/GCC/mk/startup_spc560dxx.mk b/os/common/startup/e200/compilers/GCC/mk/startup_spc560dxx.mk
index 1e1e907f5..761cd2a0e 100644
--- a/os/common/startup/e200/compilers/GCC/mk/startup_spc560dxx.mk
+++ b/os/common/startup/e200/compilers/GCC/mk/startup_spc560dxx.mk
@@ -11,6 +11,6 @@ STARTUPINC = ${CHIBIOS}/os/common/startup/e200/compilers/GCC \
 STARTUPLD  = ${CHIBIOS}/os/common/startup/e200/compilers/GCC/ld
 
 # Shared variables
-ALLASM  += $(STARTUPASM)
-ALLCSRC += $(STARTUPSRC)
-ALLINC  += $(STARTUPINC)
+ALLXASMSRC += $(STARTUPASM)
+ALLCSRC    += $(STARTUPSRC)
+ALLINC     += $(STARTUPINC)
diff --git a/os/common/startup/e200/compilers/GCC/mk/startup_spc560pxx.mk b/os/common/startup/e200/compilers/GCC/mk/startup_spc560pxx.mk
index d1fbbba07..75d423aaa 100644
--- a/os/common/startup/e200/compilers/GCC/mk/startup_spc560pxx.mk
+++ b/os/common/startup/e200/compilers/GCC/mk/startup_spc560pxx.mk
@@ -11,6 +11,6 @@ STARTUPINC = ${CHIBIOS}/os/common/startup/e200/compilers/GCC \
 STARTUPLD  = ${CHIBIOS}/os/common/startup/e200/compilers/GCC/ld
 
 # Shared variables
-ALLASM  += $(STARTUPASM)
-ALLCSRC += $(STARTUPSRC)
-ALLINC  += $(STARTUPINC)
+ALLXASMSRC += $(STARTUPASM)
+ALLCSRC    += $(STARTUPSRC)
+ALLINC     += $(STARTUPINC)
diff --git a/os/common/startup/e200/compilers/GCC/mk/startup_spc563mxx.mk b/os/common/startup/e200/compilers/GCC/mk/startup_spc563mxx.mk
index 5eec87d6e..04cf8178d 100644
--- a/os/common/startup/e200/compilers/GCC/mk/startup_spc563mxx.mk
+++ b/os/common/startup/e200/compilers/GCC/mk/startup_spc563mxx.mk
@@ -11,6 +11,6 @@ STARTUPINC = ${CHIBIOS}/os/common/startup/e200/compilers/GCC \
 STARTUPLD  = ${CHIBIOS}/os/common/startup/e200/compilers/GCC/ld
 
 # Shared variables
-ALLASM  += $(STARTUPASM)
-ALLCSRC += $(STARTUPSRC)
-ALLINC  += $(STARTUPINC)
+ALLXASMSRC += $(STARTUPASM)
+ALLCSRC    += $(STARTUPSRC)
+ALLINC     += $(STARTUPINC)
diff --git a/os/common/startup/e200/compilers/GCC/mk/startup_spc564axx.mk b/os/common/startup/e200/compilers/GCC/mk/startup_spc564axx.mk
index 6417bd922..d139632ee 100644
--- a/os/common/startup/e200/compilers/GCC/mk/startup_spc564axx.mk
+++ b/os/common/startup/e200/compilers/GCC/mk/startup_spc564axx.mk
@@ -11,6 +11,6 @@ STARTUPINC = ${CHIBIOS}/os/common/startup/e200/compilers/GCC \
 STARTUPLD  = ${CHIBIOS}/os/common/startup/e200/compilers/GCC/ld
 
 # Shared variables
-ALLASM  += $(STARTUPASM)
-ALLCSRC += $(STARTUPSRC)
-ALLINC  += $(STARTUPINC)
+ALLXASMSRC += $(STARTUPASM)
+ALLCSRC    += $(STARTUPSRC)
+ALLINC     += $(STARTUPINC)
diff --git a/os/common/startup/e200/compilers/GCC/mk/startup_spc56ecxx.mk b/os/common/startup/e200/compilers/GCC/mk/startup_spc56ecxx.mk
index a8b8d0bc9..4676dceb6 100644
--- a/os/common/startup/e200/compilers/GCC/mk/startup_spc56ecxx.mk
+++ b/os/common/startup/e200/compilers/GCC/mk/startup_spc56ecxx.mk
@@ -11,6 +11,6 @@ STARTUPINC = ${CHIBIOS}/os/common/startup/e200/compilers/GCC \
 STARTUPLD  = ${CHIBIOS}/os/common/startup/e200/compilers/GCC/ld
 
 # Shared variables
-ALLASM  += $(STARTUPASM)
-ALLCSRC += $(STARTUPSRC)
-ALLINC  += $(STARTUPINC)
+ALLXASMSRC += $(STARTUPASM)
+ALLCSRC    += $(STARTUPSRC)
+ALLINC     += $(STARTUPINC)
diff --git a/os/common/startup/e200/compilers/GCC/mk/startup_spc56elxx.mk b/os/common/startup/e200/compilers/GCC/mk/startup_spc56elxx.mk
index fa78f73af..c2a46e59a 100644
--- a/os/common/startup/e200/compilers/GCC/mk/startup_spc56elxx.mk
+++ b/os/common/startup/e200/compilers/GCC/mk/startup_spc56elxx.mk
@@ -11,6 +11,6 @@ STARTUPINC = ${CHIBIOS}/os/common/startup/e200/compilers/GCC \
 STARTUPLD  = ${CHIBIOS}/os/common/startup/e200/compilers/GCC/ld
 
 # Shared variables
-ALLASM  += $(STARTUPASM)
-ALLCSRC += $(STARTUPSRC)
-ALLINC  += $(STARTUPINC)
+ALLXASMSRC += $(STARTUPASM)
+ALLCSRC    += $(STARTUPSRC)
+ALLINC     += $(STARTUPINC)
diff --git a/os/common/startup/e200/compilers/GHS/mk/startup_spc560bcxx.mk b/os/common/startup/e200/compilers/GHS/mk/startup_spc560bcxx.mk
index 51addce32..9ebe8e5b6 100644
--- a/os/common/startup/e200/compilers/GHS/mk/startup_spc560bcxx.mk
+++ b/os/common/startup/e200/compilers/GHS/mk/startup_spc560bcxx.mk
@@ -11,6 +11,6 @@ STARTUPINC = ${CHIBIOS}/os/common/startup/e200/compilers/GHS \
 STARTUPLD  = ${CHIBIOS}/os/common/startup/e200/compilers/GHS/ld
 
 # Shared variables
-ALLASM  += $(STARTUPASM)
-ALLCSRC += $(STARTUPSRC)
-ALLINC  += $(STARTUPINC)
+ALLXASMSRC += $(STARTUPASM)
+ALLCSRC    += $(STARTUPSRC)
+ALLINC     += $(STARTUPINC)
diff --git a/os/common/startup/e200/compilers/GHS/mk/startup_spc560bxx.mk b/os/common/startup/e200/compilers/GHS/mk/startup_spc560bxx.mk
index 5dd2b9362..91d97a729 100644
--- a/os/common/startup/e200/compilers/GHS/mk/startup_spc560bxx.mk
+++ b/os/common/startup/e200/compilers/GHS/mk/startup_spc560bxx.mk
@@ -11,6 +11,6 @@ STARTUPINC = ${CHIBIOS}/os/common/startup/e200/compilers/GHS \
 STARTUPLD  = ${CHIBIOS}/os/common/startup/e200/compilers/GHS/ld
 
 # Shared variables
-ALLASM  += $(STARTUPASM)
-ALLCSRC += $(STARTUPSRC)
-ALLINC  += $(STARTUPINC)
+ALLXASMSRC += $(STARTUPASM)
+ALLCSRC    += $(STARTUPSRC)
+ALLINC     += $(STARTUPINC)
diff --git a/os/common/startup/e200/compilers/GHS/mk/startup_spc560dxx.mk b/os/common/startup/e200/compilers/GHS/mk/startup_spc560dxx.mk
index 10d96c775..516324909 100644
--- a/os/common/startup/e200/compilers/GHS/mk/startup_spc560dxx.mk
+++ b/os/common/startup/e200/compilers/GHS/mk/startup_spc560dxx.mk
@@ -11,6 +11,6 @@ STARTUPINC = ${CHIBIOS}/os/common/startup/e200/compilers/GHS \
 STARTUPLD  = ${CHIBIOS}/os/common/startup/e200/compilers/GHS/ld
 
 # Shared variables
-ALLASM  += $(STARTUPASM)
-ALLCSRC += $(STARTUPSRC)
-ALLINC  += $(STARTUPINC)
+ALLXASMSRC += $(STARTUPASM)
+ALLCSRC    += $(STARTUPSRC)
+ALLINC     += $(STARTUPINC)
diff --git a/os/common/startup/e200/compilers/GHS/mk/startup_spc560pxx.mk b/os/common/startup/e200/compilers/GHS/mk/startup_spc560pxx.mk
index e9751e3ed..a9aed3d58 100644
--- a/os/common/startup/e200/compilers/GHS/mk/startup_spc560pxx.mk
+++ b/os/common/startup/e200/compilers/GHS/mk/startup_spc560pxx.mk
@@ -11,6 +11,6 @@ STARTUPINC = ${CHIBIOS}/os/common/startup/e200/compilers/GHS \
 STARTUPLD  = ${CHIBIOS}/os/common/startup/e200/compilers/GHS/ld
 
 # Shared variables
-ALLASM  += $(STARTUPASM)
-ALLCSRC += $(STARTUPSRC)
-ALLINC  += $(STARTUPINC)
+ALLXASMSRC += $(STARTUPASM)
+ALLCSRC    += $(STARTUPSRC)
+ALLINC     += $(STARTUPINC)
diff --git a/os/common/startup/e200/compilers/GHS/mk/startup_spc563mxx.mk b/os/common/startup/e200/compilers/GHS/mk/startup_spc563mxx.mk
index 3f51a5156..6bd0f3179 100644
--- a/os/common/startup/e200/compilers/GHS/mk/startup_spc563mxx.mk
+++ b/os/common/startup/e200/compilers/GHS/mk/startup_spc563mxx.mk
@@ -11,6 +11,6 @@ STARTUPINC = ${CHIBIOS}/os/common/startup/e200/compilers/GHS \
 STARTUPLD  = ${CHIBIOS}/os/common/startup/e200/compilers/GHS/ld
 
 # Shared variables
-ALLASM  += $(STARTUPASM)
-ALLCSRC += $(STARTUPSRC)
-ALLINC  += $(STARTUPINC)
+ALLXASMSRC += $(STARTUPASM)
+ALLCSRC    += $(STARTUPSRC)
+ALLINC     += $(STARTUPINC)
diff --git a/os/common/startup/e200/compilers/GHS/mk/startup_spc564axx.mk b/os/common/startup/e200/compilers/GHS/mk/startup_spc564axx.mk
index 0b8d25fb9..d1dd6a262 100644
--- a/os/common/startup/e200/compilers/GHS/mk/startup_spc564axx.mk
+++ b/os/common/startup/e200/compilers/GHS/mk/startup_spc564axx.mk
@@ -11,6 +11,6 @@ STARTUPINC = ${CHIBIOS}/os/common/startup/e200/compilers/GHS \
 STARTUPLD  = ${CHIBIOS}/os/common/startup/e200/compilers/GHS/ld
 
 # Shared variables
-ALLASM  += $(STARTUPASM)
-ALLCSRC += $(STARTUPSRC)
-ALLINC  += $(STARTUPINC)
+ALLXASMSRC += $(STARTUPASM)
+ALLCSRC    += $(STARTUPSRC)
+ALLINC     += $(STARTUPINC)
diff --git a/os/common/startup/e200/compilers/GHS/mk/startup_spc56ecxx.mk b/os/common/startup/e200/compilers/GHS/mk/startup_spc56ecxx.mk
index 184d74145..5bc703153 100644
--- a/os/common/startup/e200/compilers/GHS/mk/startup_spc56ecxx.mk
+++ b/os/common/startup/e200/compilers/GHS/mk/startup_spc56ecxx.mk
@@ -11,6 +11,6 @@ STARTUPINC = ${CHIBIOS}/os/common/startup/e200/compilers/GHS \
 STARTUPLD  = ${CHIBIOS}/os/common/startup/e200/compilers/GHS/ld
 
 # Shared variables
-ALLASM  += $(STARTUPASM)
-ALLCSRC += $(STARTUPSRC)
-ALLINC  += $(STARTUPINC)
+ALLXASMSRC += $(STARTUPASM)
+ALLCSRC    += $(STARTUPSRC)
+ALLINC     += $(STARTUPINC)
diff --git a/os/common/startup/e200/compilers/GHS/mk/startup_spc56elxx.mk b/os/common/startup/e200/compilers/GHS/mk/startup_spc56elxx.mk
index 3c153ff16..c800d6b00 100644
--- a/os/common/startup/e200/compilers/GHS/mk/startup_spc56elxx.mk
+++ b/os/common/startup/e200/compilers/GHS/mk/startup_spc56elxx.mk
@@ -11,6 +11,6 @@ STARTUPINC = ${CHIBIOS}/os/common/startup/e200/compilers/GHS \
 STARTUPLD  = ${CHIBIOS}/os/common/startup/e200/compilers/GHS/ld
 
 # Shared variables
-ALLASM  += $(STARTUPASM)
-ALLCSRC += $(STARTUPSRC)
-ALLINC  += $(STARTUPINC)
+ALLXASMSRC += $(STARTUPASM)
+ALLCSRC    += $(STARTUPSRC)
+ALLINC     += $(STARTUPINC)