aboutsummaryrefslogtreecommitdiffstats
path: root/testhal
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2018-07-07 07:55:00 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2018-07-07 07:55:00 +0000
commit18f021db303aa9b1d70c4efa1aaa53699118e577 (patch)
tree8849ca945c18e86bba962143e82600d0cd557d54 /testhal
parent858b658d39ee627da66d1296e7b623604adee556 (diff)
downloadChibiOS-18f021db303aa9b1d70c4efa1aaa53699118e577.tar.gz
ChibiOS-18f021db303aa9b1d70c4efa1aaa53699118e577.tar.bz2
ChibiOS-18f021db303aa9b1d70c4efa1aaa53699118e577.zip
ARMCMx rules..mk path mass update.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12130 110e8d01-0319-4d1e-a829-52ad28d1bb01
Diffstat (limited to 'testhal')
-rw-r--r--testhal/STM32/STM32F0xx/ADC/Makefile2
-rw-r--r--testhal/STM32/STM32F0xx/CAN/Makefile2
-rw-r--r--testhal/STM32/STM32F0xx/IRQ_STORM/Makefile2
-rw-r--r--testhal/STM32/STM32F0xx/PWM-ICU/Makefile2
-rw-r--r--testhal/STM32/STM32F0xx/USB_CDC/Makefile2
-rw-r--r--testhal/STM32/STM32F0xx/WDG/Makefile2
-rw-r--r--testhal/STM32/STM32F1xx/ADC/Makefile2
-rw-r--r--testhal/STM32/STM32F1xx/CAN/Makefile2
-rw-r--r--testhal/STM32/STM32F1xx/I2C/Makefile2
-rw-r--r--testhal/STM32/STM32F1xx/IRQ_STORM/Makefile2
-rw-r--r--testhal/STM32/STM32F1xx/PWM-ICU/Makefile2
-rw-r--r--testhal/STM32/STM32F1xx/RTC/Makefile2
-rw-r--r--testhal/STM32/STM32F1xx/SPI/Makefile2
-rw-r--r--testhal/STM32/STM32F1xx/UART/Makefile2
-rw-r--r--testhal/STM32/STM32F1xx/USB_CDC/Makefile2
-rw-r--r--testhal/STM32/STM32F1xx/USB_CDC_F107/Makefile2
-rw-r--r--testhal/STM32/STM32F2xx/PWM-ICU/Makefile2
-rw-r--r--testhal/STM32/STM32F2xx/USB_CDC/Makefile2
-rw-r--r--testhal/STM32/STM32F37x/ADC/Makefile2
-rw-r--r--testhal/STM32/STM32F37x/CAN/Makefile2
-rw-r--r--testhal/STM32/STM32F37x/I2C/Makefile2
-rw-r--r--testhal/STM32/STM32F37x/IRQ_STORM/Makefile2
-rw-r--r--testhal/STM32/STM32F37x/PWM-ICU/Makefile2
-rw-r--r--testhal/STM32/STM32F37x/SDADC/Makefile2
-rw-r--r--testhal/STM32/STM32F37x/SPI/Makefile2
-rw-r--r--testhal/STM32/STM32F37x/UART/Makefile2
-rw-r--r--testhal/STM32/STM32F37x/USB_CDC/Makefile2
-rw-r--r--testhal/STM32/STM32F3xx/ADC/Makefile2
-rw-r--r--testhal/STM32/STM32F3xx/ADC_DUAL/Makefile2
-rw-r--r--testhal/STM32/STM32F3xx/CAN/Makefile2
-rw-r--r--testhal/STM32/STM32F3xx/DAC/Makefile2
-rw-r--r--testhal/STM32/STM32F3xx/IRQ_STORM/Makefile2
-rw-r--r--testhal/STM32/STM32F3xx/PWM-ICU/Makefile2
-rw-r--r--testhal/STM32/STM32F3xx/USB_CDC_IAD/Makefile2
-rw-r--r--testhal/STM32/STM32F3xx/WDG/Makefile2
-rw-r--r--testhal/STM32/STM32F4xx/ADC/Makefile2
-rw-r--r--testhal/STM32/STM32F4xx/CAN/Makefile2
-rw-r--r--testhal/STM32/STM32F4xx/DAC/Makefile2
-rw-r--r--testhal/STM32/STM32F4xx/DAC_DUAL/Makefile2
-rw-r--r--testhal/STM32/STM32F4xx/DMA_STORM/Makefile2
-rw-r--r--testhal/STM32/STM32F4xx/GPT/Makefile2
-rw-r--r--testhal/STM32/STM32F4xx/I2S/Makefile2
-rw-r--r--testhal/STM32/STM32F4xx/IRQ_STORM/Makefile2
-rw-r--r--testhal/STM32/STM32F4xx/IRQ_STORM_FPU/Makefile2
-rw-r--r--testhal/STM32/STM32F4xx/PWM-ICU/Makefile2
-rw-r--r--testhal/STM32/STM32F4xx/RTC/Makefile2
-rw-r--r--testhal/STM32/STM32F4xx/SDC/Makefile2
-rw-r--r--testhal/STM32/STM32F4xx/USB_CDC_IAD/Makefile2
-rw-r--r--testhal/STM32/STM32F4xx/WDG/Makefile2
-rw-r--r--testhal/STM32/STM32F7xx/GPT-ADC/Makefile2
-rw-r--r--testhal/STM32/STM32F7xx/IRQ_STORM/Makefile2
-rw-r--r--testhal/STM32/STM32F7xx/PWM-ICU/Makefile2
-rw-r--r--testhal/STM32/STM32F7xx/SPI/Makefile2
-rw-r--r--testhal/STM32/STM32F7xx/USB_RAW/Makefile2
-rw-r--r--testhal/STM32/STM32L0xx/ADC/Makefile2
-rw-r--r--testhal/STM32/STM32L0xx/SPI/Makefile2
-rw-r--r--testhal/STM32/STM32L0xx/USB_CDC/Makefile2
-rw-r--r--testhal/STM32/STM32L1xx/ADC/Makefile2
-rw-r--r--testhal/STM32/STM32L1xx/DAC/Makefile2
-rw-r--r--testhal/STM32/STM32L1xx/IRQ_STORM/Makefile2
-rw-r--r--testhal/STM32/STM32L1xx/PWM-ICU/Makefile2
-rw-r--r--testhal/STM32/STM32L1xx/SPI/Makefile2
-rw-r--r--testhal/STM32/STM32L1xx/UART/Makefile2
-rw-r--r--testhal/STM32/STM32L4xx/ADC/Makefile2
-rw-r--r--testhal/STM32/STM32L4xx/CAN/Makefile2
-rw-r--r--testhal/STM32/STM32L4xx/GPT-ADC/Makefile2
-rw-r--r--testhal/STM32/STM32L4xx/IRQ_STORM/Makefile2
-rw-r--r--testhal/STM32/multi/PAL/make/stm32f051_discovery.make2
-rw-r--r--testhal/STM32/multi/PAL/make/stm32f103_olimex.make2
-rw-r--r--testhal/STM32/multi/PAL/make/stm32f303_discovery.make2
-rw-r--r--testhal/STM32/multi/PAL/make/stm32f373_eval.make2
-rw-r--r--testhal/STM32/multi/PAL/make/stm32f407_discovery.make2
-rw-r--r--testhal/STM32/multi/PAL/make/stm32f429_discovery.make2
-rw-r--r--testhal/STM32/multi/PAL/make/stm32f746_discovery.make2
-rw-r--r--testhal/STM32/multi/PAL/make/stm32l053_discovery.make2
-rw-r--r--testhal/STM32/multi/PAL/make/stm32l151_discovery.make2
-rw-r--r--testhal/STM32/multi/PAL/make/stm32l476_discovery.make2
-rw-r--r--testhal/STM32/multi/QSPI-MFS/make/stm32l476_discovery.make2
-rw-r--r--testhal/STM32/multi/SPI/make/stm32f091_nucleo64.make2
-rw-r--r--testhal/STM32/multi/SPI/make/stm32f303_discovery.make2
-rw-r--r--testhal/STM32/multi/SPI/make/stm32f407_discovery.make2
-rw-r--r--testhal/STM32/multi/SPI/make/stm32h743_nucleo144.make2
-rw-r--r--testhal/STM32/multi/UART/make/stm32f091_nucleo64.make2
-rw-r--r--testhal/STM32/multi/UART/make/stm32f303_discovery.make2
-rw-r--r--testhal/STM32/multi/UART/make/stm32f407_discovery.make2
-rw-r--r--testhal/STM32/multi/UART/make/stm32f746_discovery.make2
-rw-r--r--testhal/STM32/multi/USB_CDC/make/stm32f303_discovery.make2
-rw-r--r--testhal/STM32/multi/USB_CDC/make/stm32f407_discovery.make2
-rw-r--r--testhal/STM32/multi/USB_CDC/make/stm32f746_discovery.make2
-rw-r--r--testhal/STM32/multi/USB_CDC/make/stm32h743_nucleo144.make2
-rw-r--r--testhal/STM32/multi/USB_CDC/make/stm32l476_discovery.make2
91 files changed, 91 insertions, 91 deletions
diff --git a/testhal/STM32/STM32F0xx/ADC/Makefile b/testhal/STM32/STM32F0xx/ADC/Makefile
index 9968ac038..ad5354350 100644
--- a/testhal/STM32/STM32F0xx/ADC/Makefile
+++ b/testhal/STM32/STM32F0xx/ADC/Makefile
@@ -205,5 +205,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F0xx/CAN/Makefile b/testhal/STM32/STM32F0xx/CAN/Makefile
index b0745f3d4..102881ccc 100644
--- a/testhal/STM32/STM32F0xx/CAN/Makefile
+++ b/testhal/STM32/STM32F0xx/CAN/Makefile
@@ -205,5 +205,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F0xx/IRQ_STORM/Makefile b/testhal/STM32/STM32F0xx/IRQ_STORM/Makefile
index b342ccc65..9177e4977 100644
--- a/testhal/STM32/STM32F0xx/IRQ_STORM/Makefile
+++ b/testhal/STM32/STM32F0xx/IRQ_STORM/Makefile
@@ -208,5 +208,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F0xx/PWM-ICU/Makefile b/testhal/STM32/STM32F0xx/PWM-ICU/Makefile
index 9968ac038..ad5354350 100644
--- a/testhal/STM32/STM32F0xx/PWM-ICU/Makefile
+++ b/testhal/STM32/STM32F0xx/PWM-ICU/Makefile
@@ -205,5 +205,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F0xx/USB_CDC/Makefile b/testhal/STM32/STM32F0xx/USB_CDC/Makefile
index f378a2e7b..f66f4bb6a 100644
--- a/testhal/STM32/STM32F0xx/USB_CDC/Makefile
+++ b/testhal/STM32/STM32F0xx/USB_CDC/Makefile
@@ -207,5 +207,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F0xx/WDG/Makefile b/testhal/STM32/STM32F0xx/WDG/Makefile
index 9968ac038..ad5354350 100644
--- a/testhal/STM32/STM32F0xx/WDG/Makefile
+++ b/testhal/STM32/STM32F0xx/WDG/Makefile
@@ -205,5 +205,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F1xx/ADC/Makefile b/testhal/STM32/STM32F1xx/ADC/Makefile
index 854b695f9..5daebe158 100644
--- a/testhal/STM32/STM32F1xx/ADC/Makefile
+++ b/testhal/STM32/STM32F1xx/ADC/Makefile
@@ -210,5 +210,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F1xx/CAN/Makefile b/testhal/STM32/STM32F1xx/CAN/Makefile
index 869f2f0ef..3402d5197 100644
--- a/testhal/STM32/STM32F1xx/CAN/Makefile
+++ b/testhal/STM32/STM32F1xx/CAN/Makefile
@@ -210,5 +210,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F1xx/I2C/Makefile b/testhal/STM32/STM32F1xx/I2C/Makefile
index d0ea7fc65..bf5e7ce2e 100644
--- a/testhal/STM32/STM32F1xx/I2C/Makefile
+++ b/testhal/STM32/STM32F1xx/I2C/Makefile
@@ -212,5 +212,5 @@ ULIBS = -lm
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F1xx/IRQ_STORM/Makefile b/testhal/STM32/STM32F1xx/IRQ_STORM/Makefile
index 0d04ca9a3..cad679428 100644
--- a/testhal/STM32/STM32F1xx/IRQ_STORM/Makefile
+++ b/testhal/STM32/STM32F1xx/IRQ_STORM/Makefile
@@ -213,5 +213,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F1xx/PWM-ICU/Makefile b/testhal/STM32/STM32F1xx/PWM-ICU/Makefile
index 869f2f0ef..3402d5197 100644
--- a/testhal/STM32/STM32F1xx/PWM-ICU/Makefile
+++ b/testhal/STM32/STM32F1xx/PWM-ICU/Makefile
@@ -210,5 +210,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F1xx/RTC/Makefile b/testhal/STM32/STM32F1xx/RTC/Makefile
index 2eb3845b6..e16f0168d 100644
--- a/testhal/STM32/STM32F1xx/RTC/Makefile
+++ b/testhal/STM32/STM32F1xx/RTC/Makefile
@@ -211,5 +211,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F1xx/SPI/Makefile b/testhal/STM32/STM32F1xx/SPI/Makefile
index 869f2f0ef..3402d5197 100644
--- a/testhal/STM32/STM32F1xx/SPI/Makefile
+++ b/testhal/STM32/STM32F1xx/SPI/Makefile
@@ -210,5 +210,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F1xx/UART/Makefile b/testhal/STM32/STM32F1xx/UART/Makefile
index 869f2f0ef..3402d5197 100644
--- a/testhal/STM32/STM32F1xx/UART/Makefile
+++ b/testhal/STM32/STM32F1xx/UART/Makefile
@@ -210,5 +210,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F1xx/USB_CDC/Makefile b/testhal/STM32/STM32F1xx/USB_CDC/Makefile
index ea7462590..d7207a67d 100644
--- a/testhal/STM32/STM32F1xx/USB_CDC/Makefile
+++ b/testhal/STM32/STM32F1xx/USB_CDC/Makefile
@@ -212,5 +212,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F1xx/USB_CDC_F107/Makefile b/testhal/STM32/STM32F1xx/USB_CDC_F107/Makefile
index 0ad9e0c99..0ba5e60dd 100644
--- a/testhal/STM32/STM32F1xx/USB_CDC_F107/Makefile
+++ b/testhal/STM32/STM32F1xx/USB_CDC_F107/Makefile
@@ -212,5 +212,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F2xx/PWM-ICU/Makefile b/testhal/STM32/STM32F2xx/PWM-ICU/Makefile
index c3f5b1942..72b13e919 100644
--- a/testhal/STM32/STM32F2xx/PWM-ICU/Makefile
+++ b/testhal/STM32/STM32F2xx/PWM-ICU/Makefile
@@ -210,5 +210,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F2xx/USB_CDC/Makefile b/testhal/STM32/STM32F2xx/USB_CDC/Makefile
index 4746c5898..0097d93fd 100644
--- a/testhal/STM32/STM32F2xx/USB_CDC/Makefile
+++ b/testhal/STM32/STM32F2xx/USB_CDC/Makefile
@@ -212,5 +212,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F37x/ADC/Makefile b/testhal/STM32/STM32F37x/ADC/Makefile
index 9a02e2c50..09c23d6cf 100644
--- a/testhal/STM32/STM32F37x/ADC/Makefile
+++ b/testhal/STM32/STM32F37x/ADC/Makefile
@@ -210,5 +210,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F37x/CAN/Makefile b/testhal/STM32/STM32F37x/CAN/Makefile
index 9a02e2c50..09c23d6cf 100644
--- a/testhal/STM32/STM32F37x/CAN/Makefile
+++ b/testhal/STM32/STM32F37x/CAN/Makefile
@@ -210,5 +210,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F37x/I2C/Makefile b/testhal/STM32/STM32F37x/I2C/Makefile
index 9a02e2c50..09c23d6cf 100644
--- a/testhal/STM32/STM32F37x/I2C/Makefile
+++ b/testhal/STM32/STM32F37x/I2C/Makefile
@@ -210,5 +210,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F37x/IRQ_STORM/Makefile b/testhal/STM32/STM32F37x/IRQ_STORM/Makefile
index 4eb1b5957..082da7e6d 100644
--- a/testhal/STM32/STM32F37x/IRQ_STORM/Makefile
+++ b/testhal/STM32/STM32F37x/IRQ_STORM/Makefile
@@ -213,5 +213,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F37x/PWM-ICU/Makefile b/testhal/STM32/STM32F37x/PWM-ICU/Makefile
index 9a02e2c50..09c23d6cf 100644
--- a/testhal/STM32/STM32F37x/PWM-ICU/Makefile
+++ b/testhal/STM32/STM32F37x/PWM-ICU/Makefile
@@ -210,5 +210,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F37x/SDADC/Makefile b/testhal/STM32/STM32F37x/SDADC/Makefile
index 9a02e2c50..09c23d6cf 100644
--- a/testhal/STM32/STM32F37x/SDADC/Makefile
+++ b/testhal/STM32/STM32F37x/SDADC/Makefile
@@ -210,5 +210,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F37x/SPI/Makefile b/testhal/STM32/STM32F37x/SPI/Makefile
index 9a02e2c50..09c23d6cf 100644
--- a/testhal/STM32/STM32F37x/SPI/Makefile
+++ b/testhal/STM32/STM32F37x/SPI/Makefile
@@ -210,5 +210,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F37x/UART/Makefile b/testhal/STM32/STM32F37x/UART/Makefile
index 9a02e2c50..09c23d6cf 100644
--- a/testhal/STM32/STM32F37x/UART/Makefile
+++ b/testhal/STM32/STM32F37x/UART/Makefile
@@ -210,5 +210,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F37x/USB_CDC/Makefile b/testhal/STM32/STM32F37x/USB_CDC/Makefile
index 51a42aeaa..94bd1b700 100644
--- a/testhal/STM32/STM32F37x/USB_CDC/Makefile
+++ b/testhal/STM32/STM32F37x/USB_CDC/Makefile
@@ -212,5 +212,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F3xx/ADC/Makefile b/testhal/STM32/STM32F3xx/ADC/Makefile
index 5458afa0c..42b2dda2b 100644
--- a/testhal/STM32/STM32F3xx/ADC/Makefile
+++ b/testhal/STM32/STM32F3xx/ADC/Makefile
@@ -210,5 +210,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F3xx/ADC_DUAL/Makefile b/testhal/STM32/STM32F3xx/ADC_DUAL/Makefile
index 5458afa0c..42b2dda2b 100644
--- a/testhal/STM32/STM32F3xx/ADC_DUAL/Makefile
+++ b/testhal/STM32/STM32F3xx/ADC_DUAL/Makefile
@@ -210,5 +210,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F3xx/CAN/Makefile b/testhal/STM32/STM32F3xx/CAN/Makefile
index 5458afa0c..42b2dda2b 100644
--- a/testhal/STM32/STM32F3xx/CAN/Makefile
+++ b/testhal/STM32/STM32F3xx/CAN/Makefile
@@ -210,5 +210,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F3xx/DAC/Makefile b/testhal/STM32/STM32F3xx/DAC/Makefile
index 5458afa0c..42b2dda2b 100644
--- a/testhal/STM32/STM32F3xx/DAC/Makefile
+++ b/testhal/STM32/STM32F3xx/DAC/Makefile
@@ -210,5 +210,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F3xx/IRQ_STORM/Makefile b/testhal/STM32/STM32F3xx/IRQ_STORM/Makefile
index 315a06959..6d964c2ce 100644
--- a/testhal/STM32/STM32F3xx/IRQ_STORM/Makefile
+++ b/testhal/STM32/STM32F3xx/IRQ_STORM/Makefile
@@ -213,5 +213,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F3xx/PWM-ICU/Makefile b/testhal/STM32/STM32F3xx/PWM-ICU/Makefile
index 5458afa0c..42b2dda2b 100644
--- a/testhal/STM32/STM32F3xx/PWM-ICU/Makefile
+++ b/testhal/STM32/STM32F3xx/PWM-ICU/Makefile
@@ -210,5 +210,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F3xx/USB_CDC_IAD/Makefile b/testhal/STM32/STM32F3xx/USB_CDC_IAD/Makefile
index 31fa9a28c..230c3e278 100644
--- a/testhal/STM32/STM32F3xx/USB_CDC_IAD/Makefile
+++ b/testhal/STM32/STM32F3xx/USB_CDC_IAD/Makefile
@@ -212,5 +212,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F3xx/WDG/Makefile b/testhal/STM32/STM32F3xx/WDG/Makefile
index 5458afa0c..42b2dda2b 100644
--- a/testhal/STM32/STM32F3xx/WDG/Makefile
+++ b/testhal/STM32/STM32F3xx/WDG/Makefile
@@ -210,5 +210,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F4xx/ADC/Makefile b/testhal/STM32/STM32F4xx/ADC/Makefile
index 9ca1d195d..cfb793d45 100644
--- a/testhal/STM32/STM32F4xx/ADC/Makefile
+++ b/testhal/STM32/STM32F4xx/ADC/Makefile
@@ -210,5 +210,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F4xx/CAN/Makefile b/testhal/STM32/STM32F4xx/CAN/Makefile
index 9ca1d195d..cfb793d45 100644
--- a/testhal/STM32/STM32F4xx/CAN/Makefile
+++ b/testhal/STM32/STM32F4xx/CAN/Makefile
@@ -210,5 +210,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F4xx/DAC/Makefile b/testhal/STM32/STM32F4xx/DAC/Makefile
index 9ca1d195d..cfb793d45 100644
--- a/testhal/STM32/STM32F4xx/DAC/Makefile
+++ b/testhal/STM32/STM32F4xx/DAC/Makefile
@@ -210,5 +210,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F4xx/DAC_DUAL/Makefile b/testhal/STM32/STM32F4xx/DAC_DUAL/Makefile
index 9ca1d195d..cfb793d45 100644
--- a/testhal/STM32/STM32F4xx/DAC_DUAL/Makefile
+++ b/testhal/STM32/STM32F4xx/DAC_DUAL/Makefile
@@ -210,5 +210,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F4xx/DMA_STORM/Makefile b/testhal/STM32/STM32F4xx/DMA_STORM/Makefile
index 9ca1d195d..cfb793d45 100644
--- a/testhal/STM32/STM32F4xx/DMA_STORM/Makefile
+++ b/testhal/STM32/STM32F4xx/DMA_STORM/Makefile
@@ -210,5 +210,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F4xx/GPT/Makefile b/testhal/STM32/STM32F4xx/GPT/Makefile
index 9ca1d195d..cfb793d45 100644
--- a/testhal/STM32/STM32F4xx/GPT/Makefile
+++ b/testhal/STM32/STM32F4xx/GPT/Makefile
@@ -210,5 +210,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F4xx/I2S/Makefile b/testhal/STM32/STM32F4xx/I2S/Makefile
index 9ca1d195d..cfb793d45 100644
--- a/testhal/STM32/STM32F4xx/I2S/Makefile
+++ b/testhal/STM32/STM32F4xx/I2S/Makefile
@@ -210,5 +210,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F4xx/IRQ_STORM/Makefile b/testhal/STM32/STM32F4xx/IRQ_STORM/Makefile
index 204ebfb4c..cc2974c07 100644
--- a/testhal/STM32/STM32F4xx/IRQ_STORM/Makefile
+++ b/testhal/STM32/STM32F4xx/IRQ_STORM/Makefile
@@ -213,5 +213,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F4xx/IRQ_STORM_FPU/Makefile b/testhal/STM32/STM32F4xx/IRQ_STORM_FPU/Makefile
index 1c311a99c..a5472d330 100644
--- a/testhal/STM32/STM32F4xx/IRQ_STORM_FPU/Makefile
+++ b/testhal/STM32/STM32F4xx/IRQ_STORM_FPU/Makefile
@@ -210,5 +210,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F4xx/PWM-ICU/Makefile b/testhal/STM32/STM32F4xx/PWM-ICU/Makefile
index 9ca1d195d..cfb793d45 100644
--- a/testhal/STM32/STM32F4xx/PWM-ICU/Makefile
+++ b/testhal/STM32/STM32F4xx/PWM-ICU/Makefile
@@ -210,5 +210,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F4xx/RTC/Makefile b/testhal/STM32/STM32F4xx/RTC/Makefile
index 1d5065e6e..01db9a36e 100644
--- a/testhal/STM32/STM32F4xx/RTC/Makefile
+++ b/testhal/STM32/STM32F4xx/RTC/Makefile
@@ -214,5 +214,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F4xx/SDC/Makefile b/testhal/STM32/STM32F4xx/SDC/Makefile
index 7faca8a54..d3bcf530a 100644
--- a/testhal/STM32/STM32F4xx/SDC/Makefile
+++ b/testhal/STM32/STM32F4xx/SDC/Makefile
@@ -212,5 +212,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F4xx/USB_CDC_IAD/Makefile b/testhal/STM32/STM32F4xx/USB_CDC_IAD/Makefile
index 7b197ef39..8a4e138ed 100644
--- a/testhal/STM32/STM32F4xx/USB_CDC_IAD/Makefile
+++ b/testhal/STM32/STM32F4xx/USB_CDC_IAD/Makefile
@@ -212,5 +212,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F4xx/WDG/Makefile b/testhal/STM32/STM32F4xx/WDG/Makefile
index 9ca1d195d..cfb793d45 100644
--- a/testhal/STM32/STM32F4xx/WDG/Makefile
+++ b/testhal/STM32/STM32F4xx/WDG/Makefile
@@ -210,5 +210,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F7xx/GPT-ADC/Makefile b/testhal/STM32/STM32F7xx/GPT-ADC/Makefile
index e4e14858f..67d87fc0d 100644
--- a/testhal/STM32/STM32F7xx/GPT-ADC/Makefile
+++ b/testhal/STM32/STM32F7xx/GPT-ADC/Makefile
@@ -215,5 +215,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F7xx/IRQ_STORM/Makefile b/testhal/STM32/STM32F7xx/IRQ_STORM/Makefile
index 7c9a579d7..c18e88fb2 100644
--- a/testhal/STM32/STM32F7xx/IRQ_STORM/Makefile
+++ b/testhal/STM32/STM32F7xx/IRQ_STORM/Makefile
@@ -218,5 +218,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F7xx/PWM-ICU/Makefile b/testhal/STM32/STM32F7xx/PWM-ICU/Makefile
index e4e14858f..67d87fc0d 100644
--- a/testhal/STM32/STM32F7xx/PWM-ICU/Makefile
+++ b/testhal/STM32/STM32F7xx/PWM-ICU/Makefile
@@ -215,5 +215,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F7xx/SPI/Makefile b/testhal/STM32/STM32F7xx/SPI/Makefile
index e4e14858f..67d87fc0d 100644
--- a/testhal/STM32/STM32F7xx/SPI/Makefile
+++ b/testhal/STM32/STM32F7xx/SPI/Makefile
@@ -215,5 +215,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F7xx/USB_RAW/Makefile b/testhal/STM32/STM32F7xx/USB_RAW/Makefile
index b3e631a96..b41123f4c 100644
--- a/testhal/STM32/STM32F7xx/USB_RAW/Makefile
+++ b/testhal/STM32/STM32F7xx/USB_RAW/Makefile
@@ -215,5 +215,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32L0xx/ADC/Makefile b/testhal/STM32/STM32L0xx/ADC/Makefile
index e1dde13a1..d0a242358 100644
--- a/testhal/STM32/STM32L0xx/ADC/Makefile
+++ b/testhal/STM32/STM32L0xx/ADC/Makefile
@@ -210,5 +210,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32L0xx/SPI/Makefile b/testhal/STM32/STM32L0xx/SPI/Makefile
index e1dde13a1..d0a242358 100644
--- a/testhal/STM32/STM32L0xx/SPI/Makefile
+++ b/testhal/STM32/STM32L0xx/SPI/Makefile
@@ -210,5 +210,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32L0xx/USB_CDC/Makefile b/testhal/STM32/STM32L0xx/USB_CDC/Makefile
index 4222ed56b..e02645095 100644
--- a/testhal/STM32/STM32L0xx/USB_CDC/Makefile
+++ b/testhal/STM32/STM32L0xx/USB_CDC/Makefile
@@ -212,5 +212,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32L1xx/ADC/Makefile b/testhal/STM32/STM32L1xx/ADC/Makefile
index daaaf3697..298caffd2 100644
--- a/testhal/STM32/STM32L1xx/ADC/Makefile
+++ b/testhal/STM32/STM32L1xx/ADC/Makefile
@@ -210,5 +210,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32L1xx/DAC/Makefile b/testhal/STM32/STM32L1xx/DAC/Makefile
index 45b55380e..e64d07fee 100644
--- a/testhal/STM32/STM32L1xx/DAC/Makefile
+++ b/testhal/STM32/STM32L1xx/DAC/Makefile
@@ -210,5 +210,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32L1xx/IRQ_STORM/Makefile b/testhal/STM32/STM32L1xx/IRQ_STORM/Makefile
index a8fbbd24c..3324fd1eb 100644
--- a/testhal/STM32/STM32L1xx/IRQ_STORM/Makefile
+++ b/testhal/STM32/STM32L1xx/IRQ_STORM/Makefile
@@ -213,5 +213,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32L1xx/PWM-ICU/Makefile b/testhal/STM32/STM32L1xx/PWM-ICU/Makefile
index daaaf3697..298caffd2 100644
--- a/testhal/STM32/STM32L1xx/PWM-ICU/Makefile
+++ b/testhal/STM32/STM32L1xx/PWM-ICU/Makefile
@@ -210,5 +210,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32L1xx/SPI/Makefile b/testhal/STM32/STM32L1xx/SPI/Makefile
index daaaf3697..298caffd2 100644
--- a/testhal/STM32/STM32L1xx/SPI/Makefile
+++ b/testhal/STM32/STM32L1xx/SPI/Makefile
@@ -210,5 +210,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32L1xx/UART/Makefile b/testhal/STM32/STM32L1xx/UART/Makefile
index daaaf3697..298caffd2 100644
--- a/testhal/STM32/STM32L1xx/UART/Makefile
+++ b/testhal/STM32/STM32L1xx/UART/Makefile
@@ -210,5 +210,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32L4xx/ADC/Makefile b/testhal/STM32/STM32L4xx/ADC/Makefile
index fba087505..402c1ce74 100644
--- a/testhal/STM32/STM32L4xx/ADC/Makefile
+++ b/testhal/STM32/STM32L4xx/ADC/Makefile
@@ -210,5 +210,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32L4xx/CAN/Makefile b/testhal/STM32/STM32L4xx/CAN/Makefile
index fba087505..402c1ce74 100644
--- a/testhal/STM32/STM32L4xx/CAN/Makefile
+++ b/testhal/STM32/STM32L4xx/CAN/Makefile
@@ -210,5 +210,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32L4xx/GPT-ADC/Makefile b/testhal/STM32/STM32L4xx/GPT-ADC/Makefile
index fba087505..402c1ce74 100644
--- a/testhal/STM32/STM32L4xx/GPT-ADC/Makefile
+++ b/testhal/STM32/STM32L4xx/GPT-ADC/Makefile
@@ -210,5 +210,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32L4xx/IRQ_STORM/Makefile b/testhal/STM32/STM32L4xx/IRQ_STORM/Makefile
index 92daa58de..8d97080ed 100644
--- a/testhal/STM32/STM32L4xx/IRQ_STORM/Makefile
+++ b/testhal/STM32/STM32L4xx/IRQ_STORM/Makefile
@@ -213,5 +213,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/multi/PAL/make/stm32f051_discovery.make b/testhal/STM32/multi/PAL/make/stm32f051_discovery.make
index e8bb01915..2aa76a8a8 100644
--- a/testhal/STM32/multi/PAL/make/stm32f051_discovery.make
+++ b/testhal/STM32/multi/PAL/make/stm32f051_discovery.make
@@ -211,5 +211,5 @@ CPPWARN = -Wall -Wextra -Wundef
# Compiler settings
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/multi/PAL/make/stm32f103_olimex.make b/testhal/STM32/multi/PAL/make/stm32f103_olimex.make
index b5da54fdc..a81d663ee 100644
--- a/testhal/STM32/multi/PAL/make/stm32f103_olimex.make
+++ b/testhal/STM32/multi/PAL/make/stm32f103_olimex.make
@@ -211,5 +211,5 @@ CPPWARN = -Wall -Wextra -Wundef
# Compiler settings
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/multi/PAL/make/stm32f303_discovery.make b/testhal/STM32/multi/PAL/make/stm32f303_discovery.make
index 3d54db30a..a5ea9d167 100644
--- a/testhal/STM32/multi/PAL/make/stm32f303_discovery.make
+++ b/testhal/STM32/multi/PAL/make/stm32f303_discovery.make
@@ -221,5 +221,5 @@ CPPWARN = -Wall -Wextra -Wundef
# Compiler settings
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/multi/PAL/make/stm32f373_eval.make b/testhal/STM32/multi/PAL/make/stm32f373_eval.make
index d2c017188..24159949d 100644
--- a/testhal/STM32/multi/PAL/make/stm32f373_eval.make
+++ b/testhal/STM32/multi/PAL/make/stm32f373_eval.make
@@ -221,5 +221,5 @@ CPPWARN = -Wall -Wextra -Wundef
# Compiler settings
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/multi/PAL/make/stm32f407_discovery.make b/testhal/STM32/multi/PAL/make/stm32f407_discovery.make
index 13c93d71a..267e27d19 100644
--- a/testhal/STM32/multi/PAL/make/stm32f407_discovery.make
+++ b/testhal/STM32/multi/PAL/make/stm32f407_discovery.make
@@ -221,5 +221,5 @@ CPPWARN = -Wall -Wextra -Wundef
# Compiler settings
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/multi/PAL/make/stm32f429_discovery.make b/testhal/STM32/multi/PAL/make/stm32f429_discovery.make
index 4d127b581..2791017e6 100644
--- a/testhal/STM32/multi/PAL/make/stm32f429_discovery.make
+++ b/testhal/STM32/multi/PAL/make/stm32f429_discovery.make
@@ -221,5 +221,5 @@ CPPWARN = -Wall -Wextra -Wundef
# Compiler settings
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/multi/PAL/make/stm32f746_discovery.make b/testhal/STM32/multi/PAL/make/stm32f746_discovery.make
index 4efcb5f3b..1c00c8519 100644
--- a/testhal/STM32/multi/PAL/make/stm32f746_discovery.make
+++ b/testhal/STM32/multi/PAL/make/stm32f746_discovery.make
@@ -221,5 +221,5 @@ CPPWARN = -Wall -Wextra -Wundef
# Compiler settings
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/multi/PAL/make/stm32l053_discovery.make b/testhal/STM32/multi/PAL/make/stm32l053_discovery.make
index 32344aa5d..de5f9307f 100644
--- a/testhal/STM32/multi/PAL/make/stm32l053_discovery.make
+++ b/testhal/STM32/multi/PAL/make/stm32l053_discovery.make
@@ -211,5 +211,5 @@ CPPWARN = -Wall -Wextra -Wundef
# Compiler settings
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/multi/PAL/make/stm32l151_discovery.make b/testhal/STM32/multi/PAL/make/stm32l151_discovery.make
index 5ec55a43b..82be8fb30 100644
--- a/testhal/STM32/multi/PAL/make/stm32l151_discovery.make
+++ b/testhal/STM32/multi/PAL/make/stm32l151_discovery.make
@@ -211,5 +211,5 @@ CPPWARN = -Wall -Wextra -Wundef
# Compiler settings
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/multi/PAL/make/stm32l476_discovery.make b/testhal/STM32/multi/PAL/make/stm32l476_discovery.make
index e00a057c3..ede1eb3de 100644
--- a/testhal/STM32/multi/PAL/make/stm32l476_discovery.make
+++ b/testhal/STM32/multi/PAL/make/stm32l476_discovery.make
@@ -221,5 +221,5 @@ CPPWARN = -Wall -Wextra -Wundef
# Compiler settings
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/multi/QSPI-MFS/make/stm32l476_discovery.make b/testhal/STM32/multi/QSPI-MFS/make/stm32l476_discovery.make
index e9f97f125..136f60f22 100644
--- a/testhal/STM32/multi/QSPI-MFS/make/stm32l476_discovery.make
+++ b/testhal/STM32/multi/QSPI-MFS/make/stm32l476_discovery.make
@@ -224,5 +224,5 @@ CPPWARN = -Wall -Wextra -Wundef
# Compiler settings
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/multi/SPI/make/stm32f091_nucleo64.make b/testhal/STM32/multi/SPI/make/stm32f091_nucleo64.make
index 11a64b10c..230acae37 100644
--- a/testhal/STM32/multi/SPI/make/stm32f091_nucleo64.make
+++ b/testhal/STM32/multi/SPI/make/stm32f091_nucleo64.make
@@ -211,5 +211,5 @@ CPPWARN = -Wall -Wextra -Wundef
# Compiler settings
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/multi/SPI/make/stm32f303_discovery.make b/testhal/STM32/multi/SPI/make/stm32f303_discovery.make
index 3d54db30a..a5ea9d167 100644
--- a/testhal/STM32/multi/SPI/make/stm32f303_discovery.make
+++ b/testhal/STM32/multi/SPI/make/stm32f303_discovery.make
@@ -221,5 +221,5 @@ CPPWARN = -Wall -Wextra -Wundef
# Compiler settings
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/multi/SPI/make/stm32f407_discovery.make b/testhal/STM32/multi/SPI/make/stm32f407_discovery.make
index 13c93d71a..267e27d19 100644
--- a/testhal/STM32/multi/SPI/make/stm32f407_discovery.make
+++ b/testhal/STM32/multi/SPI/make/stm32f407_discovery.make
@@ -221,5 +221,5 @@ CPPWARN = -Wall -Wextra -Wundef
# Compiler settings
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/multi/SPI/make/stm32h743_nucleo144.make b/testhal/STM32/multi/SPI/make/stm32h743_nucleo144.make
index b39625d10..fceaf7278 100644
--- a/testhal/STM32/multi/SPI/make/stm32h743_nucleo144.make
+++ b/testhal/STM32/multi/SPI/make/stm32h743_nucleo144.make
@@ -221,5 +221,5 @@ CPPWARN = -Wall -Wextra -Wundef
# Compiler settings
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/multi/UART/make/stm32f091_nucleo64.make b/testhal/STM32/multi/UART/make/stm32f091_nucleo64.make
index 11a64b10c..230acae37 100644
--- a/testhal/STM32/multi/UART/make/stm32f091_nucleo64.make
+++ b/testhal/STM32/multi/UART/make/stm32f091_nucleo64.make
@@ -211,5 +211,5 @@ CPPWARN = -Wall -Wextra -Wundef
# Compiler settings
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/multi/UART/make/stm32f303_discovery.make b/testhal/STM32/multi/UART/make/stm32f303_discovery.make
index 3d54db30a..a5ea9d167 100644
--- a/testhal/STM32/multi/UART/make/stm32f303_discovery.make
+++ b/testhal/STM32/multi/UART/make/stm32f303_discovery.make
@@ -221,5 +221,5 @@ CPPWARN = -Wall -Wextra -Wundef
# Compiler settings
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/multi/UART/make/stm32f407_discovery.make b/testhal/STM32/multi/UART/make/stm32f407_discovery.make
index 68fbf7d9a..962a733cb 100644
--- a/testhal/STM32/multi/UART/make/stm32f407_discovery.make
+++ b/testhal/STM32/multi/UART/make/stm32f407_discovery.make
@@ -223,5 +223,5 @@ CPPWARN = -Wall -Wextra -Wundef
# Compiler settings
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/multi/UART/make/stm32f746_discovery.make b/testhal/STM32/multi/UART/make/stm32f746_discovery.make
index 4efcb5f3b..1c00c8519 100644
--- a/testhal/STM32/multi/UART/make/stm32f746_discovery.make
+++ b/testhal/STM32/multi/UART/make/stm32f746_discovery.make
@@ -221,5 +221,5 @@ CPPWARN = -Wall -Wextra -Wundef
# Compiler settings
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/multi/USB_CDC/make/stm32f303_discovery.make b/testhal/STM32/multi/USB_CDC/make/stm32f303_discovery.make
index 62ef06b43..ae7263e04 100644
--- a/testhal/STM32/multi/USB_CDC/make/stm32f303_discovery.make
+++ b/testhal/STM32/multi/USB_CDC/make/stm32f303_discovery.make
@@ -223,5 +223,5 @@ CPPWARN = -Wall -Wextra -Wundef
# Compiler settings
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/multi/USB_CDC/make/stm32f407_discovery.make b/testhal/STM32/multi/USB_CDC/make/stm32f407_discovery.make
index 68fbf7d9a..962a733cb 100644
--- a/testhal/STM32/multi/USB_CDC/make/stm32f407_discovery.make
+++ b/testhal/STM32/multi/USB_CDC/make/stm32f407_discovery.make
@@ -223,5 +223,5 @@ CPPWARN = -Wall -Wextra -Wundef
# Compiler settings
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/multi/USB_CDC/make/stm32f746_discovery.make b/testhal/STM32/multi/USB_CDC/make/stm32f746_discovery.make
index 4179e550a..9b5a81681 100644
--- a/testhal/STM32/multi/USB_CDC/make/stm32f746_discovery.make
+++ b/testhal/STM32/multi/USB_CDC/make/stm32f746_discovery.make
@@ -223,5 +223,5 @@ CPPWARN = -Wall -Wextra -Wundef
# Compiler settings
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/multi/USB_CDC/make/stm32h743_nucleo144.make b/testhal/STM32/multi/USB_CDC/make/stm32h743_nucleo144.make
index a969e9333..4de175f1d 100644
--- a/testhal/STM32/multi/USB_CDC/make/stm32h743_nucleo144.make
+++ b/testhal/STM32/multi/USB_CDC/make/stm32h743_nucleo144.make
@@ -223,5 +223,5 @@ CPPWARN = -Wall -Wextra -Wundef
# Compiler settings
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/multi/USB_CDC/make/stm32l476_discovery.make b/testhal/STM32/multi/USB_CDC/make/stm32l476_discovery.make
index c4bf91539..23216fa3a 100644
--- a/testhal/STM32/multi/USB_CDC/make/stm32l476_discovery.make
+++ b/testhal/STM32/multi/USB_CDC/make/stm32l476_discovery.make
@@ -223,5 +223,5 @@ CPPWARN = -Wall -Wextra -Wundef
# Compiler settings
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk