aboutsummaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2018-07-07 07:55:00 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2018-07-07 07:55:00 +0000
commit18f021db303aa9b1d70c4efa1aaa53699118e577 (patch)
tree8849ca945c18e86bba962143e82600d0cd557d54 /demos
parent858b658d39ee627da66d1296e7b623604adee556 (diff)
downloadChibiOS-18f021db303aa9b1d70c4efa1aaa53699118e577.tar.gz
ChibiOS-18f021db303aa9b1d70c4efa1aaa53699118e577.tar.bz2
ChibiOS-18f021db303aa9b1d70c4efa1aaa53699118e577.zip
ARMCMx rules..mk path mass update.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12130 110e8d01-0319-4d1e-a829-52ad28d1bb01
Diffstat (limited to 'demos')
-rw-r--r--demos/STM32/CMSIS-STM32F407-DISCOVERY/Makefile2
-rw-r--r--demos/STM32/HAL-STM32F407-DISCOVERY/Makefile2
-rw-r--r--demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/Makefile2
-rw-r--r--demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/Makefile2
-rw-r--r--demos/STM32/NIL-STM32F051-DISCOVERY/Makefile2
-rw-r--r--demos/STM32/NIL-STM32F100-DISCOVERY/Makefile2
-rw-r--r--demos/STM32/NIL-STM32F303-DISCOVERY/Makefile2
-rw-r--r--demos/STM32/NIL-STM32F373-STM32373C_EVAL/Makefile2
-rw-r--r--demos/STM32/NIL-STM32F746G-DISCOVERY/Makefile2
-rw-r--r--demos/STM32/NIL-STM32L011K4-NUCLEO32/Makefile2
-rw-r--r--demos/STM32/NIL-STM32L152-DISCOVERY/Makefile2
-rw-r--r--demos/STM32/RT-STM32F030R8-NUCLEO64/Makefile2
-rw-r--r--demos/STM32/RT-STM32F031K6-NUCLEO32/Makefile2
-rw-r--r--demos/STM32/RT-STM32F042K6-NUCLEO32/Makefile2
-rw-r--r--demos/STM32/RT-STM32F051-DISCOVERY/Makefile2
-rw-r--r--demos/STM32/RT-STM32F070RB-NUCLEO64/Makefile2
-rw-r--r--demos/STM32/RT-STM32F072-DISCOVERY/Makefile2
-rw-r--r--demos/STM32/RT-STM32F072RB-NUCLEO64/Makefile2
-rw-r--r--demos/STM32/RT-STM32F091RC-NUCLEO64/Makefile2
-rw-r--r--demos/STM32/RT-STM32F100-DISCOVERY/Makefile2
-rw-r--r--demos/STM32/RT-STM32F103-MAPLEMINI/Makefile2
-rwxr-xr-xdemos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/Makefile2
-rw-r--r--demos/STM32/RT-STM32F103-OLIMEX_STM32_P103/Makefile2
-rw-r--r--demos/STM32/RT-STM32F103-STM3210E_EVAL-FATFS-USB/Makefile2
-rw-r--r--demos/STM32/RT-STM32F103RB-NUCLEO64/Makefile2
-rw-r--r--demos/STM32/RT-STM32F103_INEMO_DISCOVERY/Makefile2
-rw-r--r--demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/Makefile2
-rw-r--r--demos/STM32/RT-STM32F207-DISCOVERY/Makefile2
-rw-r--r--demos/STM32/RT-STM32F207ZG-NUCLEO144/Makefile2
-rw-r--r--demos/STM32/RT-STM32F302R8-NUCLEO64/Makefile2
-rw-r--r--demos/STM32/RT-STM32F303-DISCOVERY/Makefile2
-rw-r--r--demos/STM32/RT-STM32F303K8-NUCLEO32/Makefile2
-rw-r--r--demos/STM32/RT-STM32F303RE-NUCLEO64/Makefile2
-rw-r--r--demos/STM32/RT-STM32F303ZE-NUCLEO144/Makefile2
-rw-r--r--demos/STM32/RT-STM32F334-DISCOVERY/Makefile2
-rw-r--r--demos/STM32/RT-STM32F334R8-NUCLEO64/Makefile2
-rw-r--r--demos/STM32/RT-STM32F373-STM32373C_EVAL/Makefile2
-rw-r--r--demos/STM32/RT-STM32F401C-DISCOVERY/Makefile2
-rw-r--r--demos/STM32/RT-STM32F401RE-NUCLEO64/Makefile2
-rw-r--r--demos/STM32/RT-STM32F407-DISCOVERY-G++/Makefile2
-rw-r--r--demos/STM32/RT-STM32F407-DISCOVERY/Makefile2
-rw-r--r--demos/STM32/RT-STM32F410RB-NUCLEO64/Makefile2
-rw-r--r--demos/STM32/RT-STM32F411RE-NUCLEO64/Makefile2
-rw-r--r--demos/STM32/RT-STM32F412ZG-NUCLEO144/Makefile2
-rw-r--r--demos/STM32/RT-STM32F413ZH-NUCLEO144/Makefile2
-rw-r--r--demos/STM32/RT-STM32F429-DISCOVERY/Makefile2
-rw-r--r--demos/STM32/RT-STM32F429ZI-NUCLEO144/Makefile2
-rw-r--r--demos/STM32/RT-STM32F446RE-NUCLEO64/Makefile2
-rw-r--r--demos/STM32/RT-STM32F446ZE-NUCLEO144/Makefile2
-rw-r--r--demos/STM32/RT-STM32F469I-DISCOVERY/Makefile2
-rw-r--r--demos/STM32/RT-STM32F722ZE-NUCLEO144/Makefile2
-rw-r--r--demos/STM32/RT-STM32F746G-DISCOVERY/Makefile2
-rw-r--r--demos/STM32/RT-STM32F746ZG-NUCLEO144/Makefile2
-rw-r--r--demos/STM32/RT-STM32F767ZI-NUCLEO144/Makefile2
-rw-r--r--demos/STM32/RT-STM32F769I-DISCOVERY/Makefile2
-rw-r--r--demos/STM32/RT-STM32H743I-NUCLEO144/Makefile2
-rw-r--r--demos/STM32/RT-STM32L031K6-NUCLEO32/Makefile2
-rw-r--r--demos/STM32/RT-STM32L053-DISCOVERY/Makefile2
-rw-r--r--demos/STM32/RT-STM32L053R8-NUCLEO64/Makefile2
-rw-r--r--demos/STM32/RT-STM32L073RZ-NUCLEO64/Makefile2
-rw-r--r--demos/STM32/RT-STM32L152-DISCOVERY/Makefile2
-rw-r--r--demos/STM32/RT-STM32L152RE-NUCLEO64/Makefile2
-rw-r--r--demos/STM32/RT-STM32L432KC-NUCLEO32/Makefile2
-rw-r--r--demos/STM32/RT-STM32L476-DISCOVERY/Makefile2
-rw-r--r--demos/STM32/RT-STM32L476RG-NUCLEO64/Makefile2
-rw-r--r--demos/various/NIL-ARMCM0-GENERIC/Makefile2
-rw-r--r--demos/various/NIL-ARMCM4-GENERIC/Makefile2
-rw-r--r--demos/various/RT-ARMCM0-GENERIC/Makefile2
-rw-r--r--demos/various/RT-ARMCM4-GENERIC/Makefile2
69 files changed, 69 insertions, 69 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
##############################################################################