ARMCMx rules..mk path mass update.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12130 110e8d01-0319-4d1e-a829-52ad28d1bb01
author: Giovanni Di Sirio <gdisirio@gmail.com> 2018-07-07 07:55:00 +0000
committer: Giovanni Di Sirio <gdisirio@gmail.com> 2018-07-07 07:55:00 +0000
commit: 18f021db303aa9b1d70c4efa1aaa53699118e577 (patch)
tree: 8849ca945c18e86bba962143e82600d0cd557d54
parent: 858b658d39ee627da66d1296e7b623604adee556 (diff)
download: ChibiOS-18f021db303aa9b1d70c4efa1aaa53699118e577.tar.gz
ChibiOS-18f021db303aa9b1d70c4efa1aaa53699118e577.tar.bz2
ChibiOS-18f021db303aa9b1d70c4efa1aaa53699118e577.zip
179 files changed, 179 insertions, 179 deletions
diff --git a/demos/STM32/CMSIS-STM32F407-DISCOVERY/Makefile b/demos/STM32/CMSIS-STM32F407-DISCOVERY/Makefile
index 759275179..9c7e819f8 100644
--- a/demos/STM32/CMSIS-STM32F407-DISCOVERY/Makefile
+++ b/demos/STM32/CMSIS-STM32F407-DISCOVERY/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/demos/STM32/HAL-STM32F407-DISCOVERY/Makefile b/demos/STM32/HAL-STM32F407-DISCOVERY/Makefile
index 5c78a6e6c..8836a2d84 100644
--- a/demos/STM32/HAL-STM32F407-DISCOVERY/Makefile
+++ b/demos/STM32/HAL-STM32F407-DISCOVERY/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/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/Makefile b/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/Makefile
index dec76cb30..2ec1b96c0 100644
--- a/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/Makefile
+++ b/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/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/demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/Makefile b/demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/Makefile
index f8dfc0b75..7111ea4c3 100644
--- a/demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/Makefile
+++ b/demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/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/demos/STM32/NIL-STM32F051-DISCOVERY/Makefile b/demos/STM32/NIL-STM32F051-DISCOVERY/Makefile
index 16cdcc7f8..70c064b1b 100644
--- a/demos/STM32/NIL-STM32F051-DISCOVERY/Makefile
+++ b/demos/STM32/NIL-STM32F051-DISCOVERY/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/demos/STM32/NIL-STM32F100-DISCOVERY/Makefile b/demos/STM32/NIL-STM32F100-DISCOVERY/Makefile
index 00b867d75..6dab48790 100644
--- a/demos/STM32/NIL-STM32F100-DISCOVERY/Makefile
+++ b/demos/STM32/NIL-STM32F100-DISCOVERY/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/demos/STM32/NIL-STM32F303-DISCOVERY/Makefile b/demos/STM32/NIL-STM32F303-DISCOVERY/Makefile
index bd7be1e6e..10446e85b 100644
--- a/demos/STM32/NIL-STM32F303-DISCOVERY/Makefile
+++ b/demos/STM32/NIL-STM32F303-DISCOVERY/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/demos/STM32/NIL-STM32F373-STM32373C_EVAL/Makefile b/demos/STM32/NIL-STM32F373-STM32373C_EVAL/Makefile
index 85162fb78..ae6a9aa4e 100644
--- a/demos/STM32/NIL-STM32F373-STM32373C_EVAL/Makefile
+++ b/demos/STM32/NIL-STM32F373-STM32373C_EVAL/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/demos/STM32/NIL-STM32F746G-DISCOVERY/Makefile b/demos/STM32/NIL-STM32F746G-DISCOVERY/Makefile
index b29da60a5..52f1b0ced 100644
--- a/demos/STM32/NIL-STM32F746G-DISCOVERY/Makefile
+++ b/demos/STM32/NIL-STM32F746G-DISCOVERY/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/demos/STM32/NIL-STM32L011K4-NUCLEO32/Makefile b/demos/STM32/NIL-STM32L011K4-NUCLEO32/Makefile
index 6d3e04341..622106894 100644
--- a/demos/STM32/NIL-STM32L011K4-NUCLEO32/Makefile
+++ b/demos/STM32/NIL-STM32L011K4-NUCLEO32/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/demos/STM32/NIL-STM32L152-DISCOVERY/Makefile b/demos/STM32/NIL-STM32L152-DISCOVERY/Makefile
index 9baee1fb2..6367d5fad 100644
--- a/demos/STM32/NIL-STM32L152-DISCOVERY/Makefile
+++ b/demos/STM32/NIL-STM32L152-DISCOVERY/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/demos/STM32/RT-STM32F030R8-NUCLEO64/Makefile b/demos/STM32/RT-STM32F030R8-NUCLEO64/Makefile
index 767d46697..82c5c2381 100644
--- a/demos/STM32/RT-STM32F030R8-NUCLEO64/Makefile
+++ b/demos/STM32/RT-STM32F030R8-NUCLEO64/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/demos/STM32/RT-STM32F031K6-NUCLEO32/Makefile b/demos/STM32/RT-STM32F031K6-NUCLEO32/Makefile
index 13559ada4..30030552d 100644
--- a/demos/STM32/RT-STM32F031K6-NUCLEO32/Makefile
+++ b/demos/STM32/RT-STM32F031K6-NUCLEO32/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/demos/STM32/RT-STM32F042K6-NUCLEO32/Makefile b/demos/STM32/RT-STM32F042K6-NUCLEO32/Makefile
index 2214e7dd1..86e99fb89 100644
--- a/demos/STM32/RT-STM32F042K6-NUCLEO32/Makefile
+++ b/demos/STM32/RT-STM32F042K6-NUCLEO32/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/demos/STM32/RT-STM32F051-DISCOVERY/Makefile b/demos/STM32/RT-STM32F051-DISCOVERY/Makefile
index 97c8dd469..79f143a7a 100644
--- a/demos/STM32/RT-STM32F051-DISCOVERY/Makefile
+++ b/demos/STM32/RT-STM32F051-DISCOVERY/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/demos/STM32/RT-STM32F070RB-NUCLEO64/Makefile b/demos/STM32/RT-STM32F070RB-NUCLEO64/Makefile
index d8cf0bf6f..7f73aebc7 100644
--- a/demos/STM32/RT-STM32F070RB-NUCLEO64/Makefile
+++ b/demos/STM32/RT-STM32F070RB-NUCLEO64/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/demos/STM32/RT-STM32F072-DISCOVERY/Makefile b/demos/STM32/RT-STM32F072-DISCOVERY/Makefile
index fc0e08c0a..1e734e41b 100644
--- a/demos/STM32/RT-STM32F072-DISCOVERY/Makefile
+++ b/demos/STM32/RT-STM32F072-DISCOVERY/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/demos/STM32/RT-STM32F072RB-NUCLEO64/Makefile b/demos/STM32/RT-STM32F072RB-NUCLEO64/Makefile
index 915b11e39..044ede7b1 100644
--- a/demos/STM32/RT-STM32F072RB-NUCLEO64/Makefile
+++ b/demos/STM32/RT-STM32F072RB-NUCLEO64/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/demos/STM32/RT-STM32F091RC-NUCLEO64/Makefile b/demos/STM32/RT-STM32F091RC-NUCLEO64/Makefile
index cac095f0e..e9f9e0edf 100644
--- a/demos/STM32/RT-STM32F091RC-NUCLEO64/Makefile
+++ b/demos/STM32/RT-STM32F091RC-NUCLEO64/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/demos/STM32/RT-STM32F100-DISCOVERY/Makefile b/demos/STM32/RT-STM32F100-DISCOVERY/Makefile
index 13d3a52ac..95a1cf742 100644
--- a/demos/STM32/RT-STM32F100-DISCOVERY/Makefile
+++ b/demos/STM32/RT-STM32F100-DISCOVERY/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/demos/STM32/RT-STM32F103-MAPLEMINI/Makefile b/demos/STM32/RT-STM32F103-MAPLEMINI/Makefile
index f998b461b..b8467b941 100644
--- a/demos/STM32/RT-STM32F103-MAPLEMINI/Makefile
+++ b/demos/STM32/RT-STM32F103-MAPLEMINI/Makefile
@@ -222,5 +222,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/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/Makefile b/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/Makefile
index 503303162..2acbee8d5 100755
--- a/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/Makefile
+++ b/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/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/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103/Makefile b/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103/Makefile
index 0afcc23ea..4bd7af4e6 100644
--- a/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103/Makefile
+++ b/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103/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/demos/STM32/RT-STM32F103-STM3210E_EVAL-FATFS-USB/Makefile b/demos/STM32/RT-STM32F103-STM3210E_EVAL-FATFS-USB/Makefile
index fdd68d40f..dfab1e962 100644
--- a/demos/STM32/RT-STM32F103-STM3210E_EVAL-FATFS-USB/Makefile
+++ b/demos/STM32/RT-STM32F103-STM3210E_EVAL-FATFS-USB/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/demos/STM32/RT-STM32F103RB-NUCLEO64/Makefile b/demos/STM32/RT-STM32F103RB-NUCLEO64/Makefile
index e9c6e0957..c0fef3a03 100644
--- a/demos/STM32/RT-STM32F103RB-NUCLEO64/Makefile
+++ b/demos/STM32/RT-STM32F103RB-NUCLEO64/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/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/Makefile b/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/Makefile
index 75ab356f9..73a5c0785 100644
--- a/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/Makefile
+++ b/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/Makefile
@@ -220,5 +220,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/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/Makefile b/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/Makefile
index 4441d9cdd..894f4c1de 100644
--- a/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/Makefile
+++ b/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/Makefile
@@ -217,5 +217,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/demos/STM32/RT-STM32F207-DISCOVERY/Makefile b/demos/STM32/RT-STM32F207-DISCOVERY/Makefile
index d7d9c1537..3ee08428d 100644
--- a/demos/STM32/RT-STM32F207-DISCOVERY/Makefile
+++ b/demos/STM32/RT-STM32F207-DISCOVERY/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/demos/STM32/RT-STM32F207ZG-NUCLEO144/Makefile b/demos/STM32/RT-STM32F207ZG-NUCLEO144/Makefile
index e835ef107..d5a02d2dc 100644
--- a/demos/STM32/RT-STM32F207ZG-NUCLEO144/Makefile
+++ b/demos/STM32/RT-STM32F207ZG-NUCLEO144/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/demos/STM32/RT-STM32F302R8-NUCLEO64/Makefile b/demos/STM32/RT-STM32F302R8-NUCLEO64/Makefile
index 21137af73..ad0bb77c0 100644
--- a/demos/STM32/RT-STM32F302R8-NUCLEO64/Makefile
+++ b/demos/STM32/RT-STM32F302R8-NUCLEO64/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/demos/STM32/RT-STM32F303-DISCOVERY/Makefile b/demos/STM32/RT-STM32F303-DISCOVERY/Makefile
index 0223345e1..9da96b963 100644
--- a/demos/STM32/RT-STM32F303-DISCOVERY/Makefile
+++ b/demos/STM32/RT-STM32F303-DISCOVERY/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/demos/STM32/RT-STM32F303K8-NUCLEO32/Makefile b/demos/STM32/RT-STM32F303K8-NUCLEO32/Makefile
index 163b74fa4..0b35f7812 100644
--- a/demos/STM32/RT-STM32F303K8-NUCLEO32/Makefile
+++ b/demos/STM32/RT-STM32F303K8-NUCLEO32/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/demos/STM32/RT-STM32F303RE-NUCLEO64/Makefile b/demos/STM32/RT-STM32F303RE-NUCLEO64/Makefile
index 9ae03d775..bfd5c64f4 100644
--- a/demos/STM32/RT-STM32F303RE-NUCLEO64/Makefile
+++ b/demos/STM32/RT-STM32F303RE-NUCLEO64/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/demos/STM32/RT-STM32F303ZE-NUCLEO144/Makefile b/demos/STM32/RT-STM32F303ZE-NUCLEO144/Makefile
index 123fff572..72ea0b1ff 100644
--- a/demos/STM32/RT-STM32F303ZE-NUCLEO144/Makefile
+++ b/demos/STM32/RT-STM32F303ZE-NUCLEO144/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/demos/STM32/RT-STM32F334-DISCOVERY/Makefile b/demos/STM32/RT-STM32F334-DISCOVERY/Makefile
index 0c7f96a26..686399775 100644
--- a/demos/STM32/RT-STM32F334-DISCOVERY/Makefile
+++ b/demos/STM32/RT-STM32F334-DISCOVERY/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/demos/STM32/RT-STM32F334R8-NUCLEO64/Makefile b/demos/STM32/RT-STM32F334R8-NUCLEO64/Makefile
index 2ff5d8cf9..5a6f16e2c 100644
--- a/demos/STM32/RT-STM32F334R8-NUCLEO64/Makefile
+++ b/demos/STM32/RT-STM32F334R8-NUCLEO64/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/demos/STM32/RT-STM32F373-STM32373C_EVAL/Makefile b/demos/STM32/RT-STM32F373-STM32373C_EVAL/Makefile
index 9d71b2a60..aeba7805b 100644
--- a/demos/STM32/RT-STM32F373-STM32373C_EVAL/Makefile
+++ b/demos/STM32/RT-STM32F373-STM32373C_EVAL/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/demos/STM32/RT-STM32F401C-DISCOVERY/Makefile b/demos/STM32/RT-STM32F401C-DISCOVERY/Makefile
index c0c75a3ee..06e20a8f8 100644
--- a/demos/STM32/RT-STM32F401C-DISCOVERY/Makefile
+++ b/demos/STM32/RT-STM32F401C-DISCOVERY/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/demos/STM32/RT-STM32F401RE-NUCLEO64/Makefile b/demos/STM32/RT-STM32F401RE-NUCLEO64/Makefile
index 3251b9d72..bb4c66597 100644
--- a/demos/STM32/RT-STM32F401RE-NUCLEO64/Makefile
+++ b/demos/STM32/RT-STM32F401RE-NUCLEO64/Makefile
@@ -172,7 +172,7 @@ ULIBS =
 # Common rules
 #
 
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/mk
 include $(RULESPATH)/arm-none-eabi.mk
 include $(RULESPATH)/rules.mk
 
diff --git a/demos/STM32/RT-STM32F407-DISCOVERY-G++/Makefile b/demos/STM32/RT-STM32F407-DISCOVERY-G++/Makefile
index 0919dd130..87612adc8 100644
--- a/demos/STM32/RT-STM32F407-DISCOVERY-G++/Makefile
+++ b/demos/STM32/RT-STM32F407-DISCOVERY-G++/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/demos/STM32/RT-STM32F407-DISCOVERY/Makefile b/demos/STM32/RT-STM32F407-DISCOVERY/Makefile
index f0a9930e9..05a217d2b 100644
--- a/demos/STM32/RT-STM32F407-DISCOVERY/Makefile
+++ b/demos/STM32/RT-STM32F407-DISCOVERY/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/demos/STM32/RT-STM32F410RB-NUCLEO64/Makefile b/demos/STM32/RT-STM32F410RB-NUCLEO64/Makefile
index 5f2362a07..bc9e8bfba 100644
--- a/demos/STM32/RT-STM32F410RB-NUCLEO64/Makefile
+++ b/demos/STM32/RT-STM32F410RB-NUCLEO64/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/demos/STM32/RT-STM32F411RE-NUCLEO64/Makefile b/demos/STM32/RT-STM32F411RE-NUCLEO64/Makefile
index ad1ccb1d9..4f593937f 100644
--- a/demos/STM32/RT-STM32F411RE-NUCLEO64/Makefile
+++ b/demos/STM32/RT-STM32F411RE-NUCLEO64/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/demos/STM32/RT-STM32F412ZG-NUCLEO144/Makefile b/demos/STM32/RT-STM32F412ZG-NUCLEO144/Makefile
index b372dad73..355a302d7 100644
--- a/demos/STM32/RT-STM32F412ZG-NUCLEO144/Makefile
+++ b/demos/STM32/RT-STM32F412ZG-NUCLEO144/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/demos/STM32/RT-STM32F413ZH-NUCLEO144/Makefile b/demos/STM32/RT-STM32F413ZH-NUCLEO144/Makefile
index 83515f7fc..750be46a8 100644
--- a/demos/STM32/RT-STM32F413ZH-NUCLEO144/Makefile
+++ b/demos/STM32/RT-STM32F413ZH-NUCLEO144/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/demos/STM32/RT-STM32F429-DISCOVERY/Makefile b/demos/STM32/RT-STM32F429-DISCOVERY/Makefile
index 45471e9b2..e98928f71 100644
--- a/demos/STM32/RT-STM32F429-DISCOVERY/Makefile
+++ b/demos/STM32/RT-STM32F429-DISCOVERY/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/demos/STM32/RT-STM32F429ZI-NUCLEO144/Makefile b/demos/STM32/RT-STM32F429ZI-NUCLEO144/Makefile
index 6fae76fc4..5b51d0c95 100644
--- a/demos/STM32/RT-STM32F429ZI-NUCLEO144/Makefile
+++ b/demos/STM32/RT-STM32F429ZI-NUCLEO144/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/demos/STM32/RT-STM32F446RE-NUCLEO64/Makefile b/demos/STM32/RT-STM32F446RE-NUCLEO64/Makefile
index 28f5a43fd..42c20acfc 100644
--- a/demos/STM32/RT-STM32F446RE-NUCLEO64/Makefile
+++ b/demos/STM32/RT-STM32F446RE-NUCLEO64/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/demos/STM32/RT-STM32F446ZE-NUCLEO144/Makefile b/demos/STM32/RT-STM32F446ZE-NUCLEO144/Makefile
index 7131d4bbd..c0dedf418 100644
--- a/demos/STM32/RT-STM32F446ZE-NUCLEO144/Makefile
+++ b/demos/STM32/RT-STM32F446ZE-NUCLEO144/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/demos/STM32/RT-STM32F469I-DISCOVERY/Makefile b/demos/STM32/RT-STM32F469I-DISCOVERY/Makefile
index df933a157..6f0abe359 100644
--- a/demos/STM32/RT-STM32F469I-DISCOVERY/Makefile
+++ b/demos/STM32/RT-STM32F469I-DISCOVERY/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/demos/STM32/RT-STM32F722ZE-NUCLEO144/Makefile b/demos/STM32/RT-STM32F722ZE-NUCLEO144/Makefile
index 6ce8bcf75..d50a9abbb 100644
--- a/demos/STM32/RT-STM32F722ZE-NUCLEO144/Makefile
+++ b/demos/STM32/RT-STM32F722ZE-NUCLEO144/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/demos/STM32/RT-STM32F746G-DISCOVERY/Makefile b/demos/STM32/RT-STM32F746G-DISCOVERY/Makefile
index 4c8954433..67f123758 100644
--- a/demos/STM32/RT-STM32F746G-DISCOVERY/Makefile
+++ b/demos/STM32/RT-STM32F746G-DISCOVERY/Makefile
@@ -220,5 +220,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/demos/STM32/RT-STM32F746ZG-NUCLEO144/Makefile b/demos/STM32/RT-STM32F746ZG-NUCLEO144/Makefile
index 6d0ea47ac..f698cdda1 100644
--- a/demos/STM32/RT-STM32F746ZG-NUCLEO144/Makefile
+++ b/demos/STM32/RT-STM32F746ZG-NUCLEO144/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/demos/STM32/RT-STM32F767ZI-NUCLEO144/Makefile b/demos/STM32/RT-STM32F767ZI-NUCLEO144/Makefile
index 3de494a54..62715b9cd 100644
--- a/demos/STM32/RT-STM32F767ZI-NUCLEO144/Makefile
+++ b/demos/STM32/RT-STM32F767ZI-NUCLEO144/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/demos/STM32/RT-STM32F769I-DISCOVERY/Makefile b/demos/STM32/RT-STM32F769I-DISCOVERY/Makefile
index 0b3302942..f8cd3e2ab 100644
--- a/demos/STM32/RT-STM32F769I-DISCOVERY/Makefile
+++ b/demos/STM32/RT-STM32F769I-DISCOVERY/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/demos/STM32/RT-STM32H743I-NUCLEO144/Makefile b/demos/STM32/RT-STM32H743I-NUCLEO144/Makefile
index 95d18528f..611d26147 100644
--- a/demos/STM32/RT-STM32H743I-NUCLEO144/Makefile
+++ b/demos/STM32/RT-STM32H743I-NUCLEO144/Makefile
@@ -220,5 +220,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/demos/STM32/RT-STM32L031K6-NUCLEO32/Makefile b/demos/STM32/RT-STM32L031K6-NUCLEO32/Makefile
index c85099d1d..2d4d8da58 100644
--- a/demos/STM32/RT-STM32L031K6-NUCLEO32/Makefile
+++ b/demos/STM32/RT-STM32L031K6-NUCLEO32/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/demos/STM32/RT-STM32L053-DISCOVERY/Makefile b/demos/STM32/RT-STM32L053-DISCOVERY/Makefile
index 769bd2d5b..deca81087 100644
--- a/demos/STM32/RT-STM32L053-DISCOVERY/Makefile
+++ b/demos/STM32/RT-STM32L053-DISCOVERY/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/demos/STM32/RT-STM32L053R8-NUCLEO64/Makefile b/demos/STM32/RT-STM32L053R8-NUCLEO64/Makefile
index 0785bd6d0..5a31b9a74 100644
--- a/demos/STM32/RT-STM32L053R8-NUCLEO64/Makefile
+++ b/demos/STM32/RT-STM32L053R8-NUCLEO64/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/demos/STM32/RT-STM32L073RZ-NUCLEO64/Makefile b/demos/STM32/RT-STM32L073RZ-NUCLEO64/Makefile
index fd331ea58..7985775d4 100644
--- a/demos/STM32/RT-STM32L073RZ-NUCLEO64/Makefile
+++ b/demos/STM32/RT-STM32L073RZ-NUCLEO64/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/demos/STM32/RT-STM32L152-DISCOVERY/Makefile b/demos/STM32/RT-STM32L152-DISCOVERY/Makefile
index 55565eab6..2f8d118d0 100644
--- a/demos/STM32/RT-STM32L152-DISCOVERY/Makefile
+++ b/demos/STM32/RT-STM32L152-DISCOVERY/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/demos/STM32/RT-STM32L152RE-NUCLEO64/Makefile b/demos/STM32/RT-STM32L152RE-NUCLEO64/Makefile
index 6bb1c319e..55fa50850 100644
--- a/demos/STM32/RT-STM32L152RE-NUCLEO64/Makefile
+++ b/demos/STM32/RT-STM32L152RE-NUCLEO64/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/demos/STM32/RT-STM32L432KC-NUCLEO32/Makefile b/demos/STM32/RT-STM32L432KC-NUCLEO32/Makefile
index aa6ae5c15..e6c852f7c 100644
--- a/demos/STM32/RT-STM32L432KC-NUCLEO32/Makefile
+++ b/demos/STM32/RT-STM32L432KC-NUCLEO32/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/demos/STM32/RT-STM32L476-DISCOVERY/Makefile b/demos/STM32/RT-STM32L476-DISCOVERY/Makefile
index 881f1aade..780013070 100644
--- a/demos/STM32/RT-STM32L476-DISCOVERY/Makefile
+++ b/demos/STM32/RT-STM32L476-DISCOVERY/Makefile
@@ -172,7 +172,7 @@ ULIBS =
 # Common rules
 #
 
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/mk
 include $(RULESPATH)/arm-none-eabi.mk
 include $(RULESPATH)/rules.mk
 
diff --git a/demos/STM32/RT-STM32L476RG-NUCLEO64/Makefile b/demos/STM32/RT-STM32L476RG-NUCLEO64/Makefile
index b6a081059..599e36c69 100644
--- a/demos/STM32/RT-STM32L476RG-NUCLEO64/Makefile
+++ b/demos/STM32/RT-STM32L476RG-NUCLEO64/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/demos/various/NIL-ARMCM0-GENERIC/Makefile b/demos/various/NIL-ARMCM0-GENERIC/Makefile
index 32aba1db1..ec9ce157b 100644
--- a/demos/various/NIL-ARMCM0-GENERIC/Makefile
+++ b/demos/various/NIL-ARMCM0-GENERIC/Makefile
@@ -216,7 +216,7 @@ 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/demos/various/NIL-ARMCM4-GENERIC/Makefile b/demos/various/NIL-ARMCM4-GENERIC/Makefile
index 21414c527..9490df22d 100644
--- a/demos/various/NIL-ARMCM4-GENERIC/Makefile
+++ b/demos/various/NIL-ARMCM4-GENERIC/Makefile
@@ -216,7 +216,7 @@ 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/demos/various/RT-ARMCM0-GENERIC/Makefile b/demos/various/RT-ARMCM0-GENERIC/Makefile
index 9e14837db..4cfcf6c47 100644
--- a/demos/various/RT-ARMCM0-GENERIC/Makefile
+++ b/demos/various/RT-ARMCM0-GENERIC/Makefile
@@ -213,7 +213,7 @@ 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/demos/various/RT-ARMCM4-GENERIC/Makefile b/demos/various/RT-ARMCM4-GENERIC/Makefile
index f0ad7f579..82427f1c7 100644
--- a/demos/various/RT-ARMCM4-GENERIC/Makefile
+++ b/demos/various/RT-ARMCM4-GENERIC/Makefile
@@ -220,7 +220,7 @@ 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/test/hal/testbuild/Makefile b/test/hal/testbuild/Makefile
index b71eb45fa..05daed982 100644
--- a/test/hal/testbuild/Makefile
+++ b/test/hal/testbuild/Makefile
@@ -216,7 +216,7 @@ 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
 
 misra:
diff --git a/test/nil/testbuild/Makefile b/test/nil/testbuild/Makefile
index 19cae4420..431bf9d1f 100755
--- a/test/nil/testbuild/Makefile
+++ b/test/nil/testbuild/Makefile
@@ -216,7 +216,7 @@ 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/testex/STM32/STM32F3xx/I2C-LSM303DLHC/Makefile b/testex/STM32/STM32F3xx/I2C-LSM303DLHC/Makefile
index eb4afa3d5..0f306ff06 100644
--- a/testex/STM32/STM32F3xx/I2C-LSM303DLHC/Makefile
+++ b/testex/STM32/STM32F3xx/I2C-LSM303DLHC/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/testex/STM32/STM32F3xx/SPI-L3GD20/Makefile b/testex/STM32/STM32F3xx/SPI-L3GD20/Makefile
index a280ee768..5ae8ae4f7 100644
--- a/testex/STM32/STM32F3xx/SPI-L3GD20/Makefile
+++ b/testex/STM32/STM32F3xx/SPI-L3GD20/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/testex/STM32/STM32F3xx/SPI-N25Q128/Makefile b/testex/STM32/STM32F3xx/SPI-N25Q128/Makefile
index 91d0f241a..52adae16f 100644
--- a/testex/STM32/STM32F3xx/SPI-N25Q128/Makefile
+++ b/testex/STM32/STM32F3xx/SPI-N25Q128/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/testex/STM32/STM32F4xx/I2C-BMP085/Makefile b/testex/STM32/STM32F4xx/I2C-BMP085/Makefile
index d712851bb..95ac63dbd 100644
--- a/testex/STM32/STM32F4xx/I2C-BMP085/Makefile
+++ b/testex/STM32/STM32F4xx/I2C-BMP085/Makefile
@@ -220,5 +220,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/testex/STM32/STM32F4xx/I2C-HTS221/Makefile b/testex/STM32/STM32F4xx/I2C-HTS221/Makefile
index 46a1c81a8..301a8bb92 100644
--- a/testex/STM32/STM32F4xx/I2C-HTS221/Makefile
+++ b/testex/STM32/STM32F4xx/I2C-HTS221/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/testex/STM32/STM32F4xx/I2C-LIS3MLD/Makefile b/testex/STM32/STM32F4xx/I2C-LIS3MLD/Makefile
index b93e8ae3d..05af1d310 100644
--- a/testex/STM32/STM32F4xx/I2C-LIS3MLD/Makefile
+++ b/testex/STM32/STM32F4xx/I2C-LIS3MLD/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/testex/STM32/STM32F4xx/I2C-LPS22HB/Makefile b/testex/STM32/STM32F4xx/I2C-LPS22HB/Makefile
index add3ae7f0..89543ec4a 100644
--- a/testex/STM32/STM32F4xx/I2C-LPS22HB/Makefile
+++ b/testex/STM32/STM32F4xx/I2C-LPS22HB/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/testex/STM32/STM32F4xx/I2C-LPS25H/Makefile b/testex/STM32/STM32F4xx/I2C-LPS25H/Makefile
index 3ff40b8c9..368c5f227 100644
--- a/testex/STM32/STM32F4xx/I2C-LPS25H/Makefile
+++ b/testex/STM32/STM32F4xx/I2C-LPS25H/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/testex/STM32/STM32F4xx/I2C-LSM303AGR/Makefile b/testex/STM32/STM32F4xx/I2C-LSM303AGR/Makefile
index c9697e206..d19e03776 100644
--- a/testex/STM32/STM32F4xx/I2C-LSM303AGR/Makefile
+++ b/testex/STM32/STM32F4xx/I2C-LSM303AGR/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/testex/STM32/STM32F4xx/I2C-LSM303DLHC/Makefile b/testex/STM32/STM32F4xx/I2C-LSM303DLHC/Makefile
index 9d3c2c8dd..84e7f983c 100644
--- a/testex/STM32/STM32F4xx/I2C-LSM303DLHC/Makefile
+++ b/testex/STM32/STM32F4xx/I2C-LSM303DLHC/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/testex/STM32/STM32F4xx/I2C-LSM6DS0/Makefile b/testex/STM32/STM32F4xx/I2C-LSM6DS0/Makefile
index b404ccd51..7e6b5da73 100644
--- a/testex/STM32/STM32F4xx/I2C-LSM6DS0/Makefile
+++ b/testex/STM32/STM32F4xx/I2C-LSM6DS0/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/testex/STM32/STM32F4xx/I2C-LSM6DSL/Makefile b/testex/STM32/STM32F4xx/I2C-LSM6DSL/Makefile
index 37f8949a4..15b4513b1 100644
--- a/testex/STM32/STM32F4xx/I2C-LSM6DSL/Makefile
+++ b/testex/STM32/STM32F4xx/I2C-LSM6DSL/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/testex/STM32/STM32F4xx/SPI-L3GD20/Makefile b/testex/STM32/STM32F4xx/SPI-L3GD20/Makefile
index 8a147e738..3bbae44af 100644
--- a/testex/STM32/STM32F4xx/SPI-L3GD20/Makefile
+++ b/testex/STM32/STM32F4xx/SPI-L3GD20/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/testex/STM32/STM32F4xx/SPI-LIS302DL/Makefile b/testex/STM32/STM32F4xx/SPI-LIS302DL/Makefile
index b7f62bcc9..904918942 100644
--- a/testex/STM32/STM32F4xx/SPI-LIS302DL/Makefile
+++ b/testex/STM32/STM32F4xx/SPI-LIS302DL/Makefile
@@ -225,5 +225,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/testex/STM32/STM32F4xx/SPI-LIS3DSH/Makefile b/testex/STM32/STM32F4xx/SPI-LIS3DSH/Makefile
index e572a07e4..f8d25b5fd 100644
--- a/testex/STM32/STM32F4xx/SPI-LIS3DSH/Makefile
+++ b/testex/STM32/STM32F4xx/SPI-LIS3DSH/Makefile
@@ -225,5 +225,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/testex/STM32/STM32L4xx/QSPI-N25Q128/Makefile b/testex/STM32/STM32L4xx/QSPI-N25Q128/Makefile
index f3acf95d8..edd660799 100644
--- a/testex/STM32/STM32L4xx/QSPI-N25Q128/Makefile
+++ b/testex/STM32/STM32L4xx/QSPI-N25Q128/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/testex/STM32/STM32L4xx/SPI-L3GD20/Makefile b/testex/STM32/STM32L4xx/SPI-L3GD20/Makefile
index 958300775..a21cb3320 100644
--- a/testex/STM32/STM32L4xx/SPI-L3GD20/Makefile
+++ b/testex/STM32/STM32L4xx/SPI-L3GD20/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/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
author	Giovanni Di Sirio <gdisirio@gmail.com>	2018-07-07 07:55:00 +0000
committer	Giovanni Di Sirio <gdisirio@gmail.com>	2018-07-07 07:55:00 +0000
commit	18f021db303aa9b1d70c4efa1aaa53699118e577 (patch)
tree	8849ca945c18e86bba962143e82600d0cd557d54
parent	858b658d39ee627da66d1296e7b623604adee556 (diff)
download	ChibiOS-18f021db303aa9b1d70c4efa1aaa53699118e577.tar.gz ChibiOS-18f021db303aa9b1d70c4efa1aaa53699118e577.tar.bz2 ChibiOS-18f021db303aa9b1d70c4efa1aaa53699118e577.zip