10 files changed, 20 insertions, 10 deletions
diff --git a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f0xx.mk b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f0xx.mk
index ed83c118c..310156070 100644
--- a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f0xx.mk
+++ b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f0xx.mk
@@ -4,7 +4,8 @@ STARTUPSRC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt1.c
 STARTUPASM = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt0_v6m.S \
              $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/vectors.S
 
-STARTUPINC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC \
+STARTUPINC = $(CHIBIOS)/os/common/portability/GCC \
+             $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC \
              $(CHIBIOS)/os/common/startup/ARMCMx/devices/STM32F0xx \
              $(CHIBIOS)/os/common/ext/ARM/CMSIS/Core/Include \
              $(CHIBIOS)/os/common/ext/ST/STM32F0xx
diff --git a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f1xx.mk b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f1xx.mk
index d72083041..0247e72d7 100644
--- a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f1xx.mk
+++ b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f1xx.mk
@@ -4,7 +4,8 @@ STARTUPSRC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt1.c
 STARTUPASM = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt0_v7m.S \
              $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/vectors.S
 
-STARTUPINC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC \
+STARTUPINC = $(CHIBIOS)/os/common/portability/GCC \
+             $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC \
              $(CHIBIOS)/os/common/startup/ARMCMx/devices/STM32F1xx \
              $(CHIBIOS)/os/common/ext/ARM/CMSIS/Core/Include \
              $(CHIBIOS)/os/common/ext/ST/STM32F1xx
diff --git a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f2xx.mk b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f2xx.mk
index a14470559..e216f1e2c 100644
--- a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f2xx.mk
+++ b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f2xx.mk
@@ -4,7 +4,8 @@ STARTUPSRC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt1.c
 STARTUPASM = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt0_v7m.S \
              $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/vectors.S
 
-STARTUPINC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC \
+STARTUPINC = $(CHIBIOS)/os/common/portability/GCC \
+             $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC \
              $(CHIBIOS)/os/common/startup/ARMCMx/devices/STM32F2xx \
              $(CHIBIOS)/os/common/ext/ARM/CMSIS/Core/Include \
              $(CHIBIOS)/os/common/ext/ST/STM32F2xx
diff --git a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f3xx.mk b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f3xx.mk
index ab8dd22d1..765040573 100644
--- a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f3xx.mk
+++ b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f3xx.mk
@@ -4,7 +4,8 @@ STARTUPSRC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt1.c
 STARTUPASM = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt0_v7m.S \
              $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/vectors.S
 
-STARTUPINC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC \
+STARTUPINC = $(CHIBIOS)/os/common/portability/GCC \
+             $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC \
              $(CHIBIOS)/os/common/startup/ARMCMx/devices/STM32F3xx \
              $(CHIBIOS)/os/common/ext/ARM/CMSIS/Core/Include \
              $(CHIBIOS)/os/common/ext/ST/STM32F3xx
diff --git a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk
index 1a38afa54..e0c8d5561 100644
--- a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk
+++ b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk
@@ -4,7 +4,8 @@ STARTUPSRC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt1.c
 STARTUPASM = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt0_v7m.S \
              $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/vectors.S
 
-STARTUPINC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC \
+STARTUPINC = $(CHIBIOS)/os/common/portability/GCC \
+             $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC \
              $(CHIBIOS)/os/common/startup/ARMCMx/devices/STM32F4xx \
              $(CHIBIOS)/os/common/ext/ARM/CMSIS/Core/Include \
              $(CHIBIOS)/os/common/ext/ST/STM32F4xx
diff --git a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f7xx.mk b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f7xx.mk
index b2c0f7144..1846f435d 100644
--- a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f7xx.mk
+++ b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f7xx.mk
@@ -4,7 +4,8 @@ STARTUPSRC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt1.c
 STARTUPASM = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt0_v7m.S \
              $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/vectors.S
 
-STARTUPINC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC \
+STARTUPINC = $(CHIBIOS)/os/common/portability/GCC \
+             $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC \
              $(CHIBIOS)/os/common/startup/ARMCMx/devices/STM32F7xx \
              $(CHIBIOS)/os/common/ext/ARM/CMSIS/Core/Include \
              $(CHIBIOS)/os/common/ext/ST/STM32F7xx
diff --git a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32h7xx.mk b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32h7xx.mk
index 9b3b18d93..e467162d8 100644
--- a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32h7xx.mk
+++ b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32h7xx.mk
@@ -4,7 +4,8 @@ STARTUPSRC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt1.c
 STARTUPASM = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt0_v7m.S \
              $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/vectors.S
 
-STARTUPINC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC \
+STARTUPINC = $(CHIBIOS)/os/common/portability/GCC \
+             $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC \
              $(CHIBIOS)/os/common/startup/ARMCMx/devices/STM32H7xx \
              $(CHIBIOS)/os/common/ext/ARM/CMSIS/Core/Include \
              $(CHIBIOS)/os/common/ext/ST/STM32H7xx
diff --git a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32l0xx.mk b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32l0xx.mk
index 5a2ec8e60..0c6fc359b 100644
--- a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32l0xx.mk
+++ b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32l0xx.mk
@@ -4,7 +4,8 @@ STARTUPSRC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt1.c
 STARTUPASM = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt0_v6m.S \
              $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/vectors.S
 
-STARTUPINC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC \
+STARTUPINC = $(CHIBIOS)/os/common/portability/GCC \
+             $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC \
              $(CHIBIOS)/os/common/startup/ARMCMx/devices/STM32L0xx \
              $(CHIBIOS)/os/common/ext/ARM/CMSIS/Core/Include \
              $(CHIBIOS)/os/common/ext/ST/STM32L0xx
diff --git a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32l1xx.mk b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32l1xx.mk
index c37a4bdd9..96510e411 100644
--- a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32l1xx.mk
+++ b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32l1xx.mk
@@ -4,7 +4,8 @@ STARTUPSRC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt1.c
 STARTUPASM = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt0_v7m.S \
              $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/vectors.S
 
-STARTUPINC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC \
+STARTUPINC = $(CHIBIOS)/os/common/portability/GCC \
+             $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC \
              $(CHIBIOS)/os/common/startup/ARMCMx/devices/STM32L1xx \
              $(CHIBIOS)/os/common/ext/ARM/CMSIS/Core/Include \
              $(CHIBIOS)/os/common/ext/ST/STM32L1xx
diff --git a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32l4xx.mk b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32l4xx.mk
index 4a8db1a87..87f6587c3 100644
--- a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32l4xx.mk
+++ b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32l4xx.mk
@@ -4,7 +4,8 @@ STARTUPSRC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt1.c
 STARTUPASM = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt0_v7m.S \
              $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/vectors.S
 
-STARTUPINC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC \
+STARTUPINC = $(CHIBIOS)/os/common/portability/GCC \
+             $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC \
              $(CHIBIOS)/os/common/startup/ARMCMx/devices/STM32L4xx \
              $(CHIBIOS)/os/common/ext/ARM/CMSIS/Core/Include \
              $(CHIBIOS)/os/common/ext/ST/STM32L4xx