aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--demos/nil/NIL-STM32F051-DISCOVERY/.cproject43
-rw-r--r--demos/nil/NIL-STM32F051-DISCOVERY/Makefile2
-rw-r--r--demos/nil/NIL-STM32F100-DISCOVERY/.cproject44
-rw-r--r--demos/nil/NIL-STM32F100-DISCOVERY/Makefile4
-rw-r--r--demos/nil/NIL-STM32F303-DISCOVERY/Makefile2
-rw-r--r--demos/nil/NIL-STM32F373-STM32373C_EVAL/.cproject44
-rw-r--r--demos/nil/NIL-STM32F373-STM32373C_EVAL/Makefile2
-rw-r--r--demos/nil/NIL-STM32L152-DISCOVERY/.cproject44
-rw-r--r--demos/nil/NIL-STM32L152-DISCOVERY/Makefile2
-rw-r--r--demos/rt/RT-STM32F051-DISCOVERY/Makefile2
-rw-r--r--demos/rt/RT-STM32F100-DISCOVERY/.cproject44
-rw-r--r--demos/rt/RT-STM32F100-DISCOVERY/Makefile2
-rw-r--r--demos/rt/RT-STM32F103-OLIMEX_STM32_P103/.cproject44
-rw-r--r--demos/rt/RT-STM32F103-OLIMEX_STM32_P103/Makefile2
-rw-r--r--demos/rt/RT-STM32F303-DISCOVERY/Makefile2
-rw-r--r--demos/rt/RT-STM32F373-STM32373C_EVAL/.cproject1
-rw-r--r--demos/rt/RT-STM32F373-STM32373C_EVAL/Makefile2
-rw-r--r--demos/rt/RT-STM32F407-DISCOVERY-MEMS/Makefile2
-rw-r--r--demos/rt/RT-STM32F407-DISCOVERY/Makefile2
-rw-r--r--demos/rt/RT-STM32F429-DISCOVERY/Makefile2
-rw-r--r--demos/rt/RT-STM32L152-DISCOVERY/Makefile2
-rw-r--r--os/hal/ports/STM32/STM32F0xx/platform.mk46
-rw-r--r--os/hal/ports/STM32/STM32F1xx/platform.mk56
-rw-r--r--os/hal/ports/STM32/STM32F1xx/platform_f105_f107.mk54
-rw-r--r--os/hal/ports/STM32/STM32F30x/platform.mk52
-rw-r--r--os/hal/ports/STM32/STM32F37x/platform.mk52
-rw-r--r--os/hal/ports/STM32/STM32F4xx/platform.mk56
-rw-r--r--os/hal/ports/STM32/STM32L1xx/platform.mk46
-rw-r--r--testhal/STM32F0xx/ADC/Makefile2
-rw-r--r--testhal/STM32F0xx/EXT/Makefile2
-rw-r--r--testhal/STM32F0xx/IRQ_STORM/Makefile2
-rw-r--r--testhal/STM32F0xx/PWM-ICU/Makefile2
-rw-r--r--testhal/STM32F0xx/SPI/Makefile2
-rw-r--r--testhal/STM32F0xx/UART/Makefile2
-rw-r--r--testhal/STM32F1xx/ADC/Makefile2
-rw-r--r--testhal/STM32F1xx/CAN/Makefile2
-rw-r--r--testhal/STM32F1xx/EXT/Makefile2
-rw-r--r--testhal/STM32F1xx/IRQ_STORM/Makefile2
-rw-r--r--testhal/STM32F1xx/PWM-ICU/Makefile2
-rw-r--r--testhal/STM32F1xx/SPI/Makefile2
-rw-r--r--testhal/STM32F1xx/UART/Makefile2
-rw-r--r--testhal/STM32F1xx/USB_CDC/Makefile2
-rw-r--r--testhal/STM32F30x/ADC/Makefile2
-rw-r--r--testhal/STM32F30x/ADC_DUAL/Makefile2
-rw-r--r--testhal/STM32F30x/CAN/Makefile2
-rw-r--r--testhal/STM32F30x/EXT/Makefile2
-rw-r--r--testhal/STM32F30x/IRQ_STORM/Makefile2
-rw-r--r--testhal/STM32F30x/PWM-ICU/Makefile2
-rw-r--r--testhal/STM32F30x/SPI/Makefile2
-rw-r--r--testhal/STM32F30x/UART/Makefile2
-rw-r--r--testhal/STM32F30x/USB_CDC/Makefile2
-rw-r--r--testhal/STM32F37x/ADC/Makefile2
-rw-r--r--testhal/STM32F37x/CAN/Makefile2
-rw-r--r--testhal/STM32F37x/EXT/Makefile2
-rw-r--r--testhal/STM32F37x/I2C/Makefile2
-rw-r--r--testhal/STM32F37x/IRQ_STORM/Makefile2
-rw-r--r--testhal/STM32F37x/PWM-ICU/Makefile2
-rw-r--r--testhal/STM32F37x/SDADC/Makefile2
-rw-r--r--testhal/STM32F37x/SPI/Makefile2
-rw-r--r--testhal/STM32F37x/UART/Makefile2
-rw-r--r--testhal/STM32F37x/USB_CDC/Makefile2
-rw-r--r--testhal/STM32F4xx/ADC/Makefile2
-rw-r--r--testhal/STM32F4xx/CAN/Makefile2
-rw-r--r--testhal/STM32F4xx/DMA_STORM/Makefile2
-rw-r--r--testhal/STM32F4xx/EXT/Makefile2
-rw-r--r--testhal/STM32F4xx/GPT/Makefile2
-rw-r--r--testhal/STM32F4xx/I2C/Makefile2
-rw-r--r--testhal/STM32F4xx/IRQ_STORM/Makefile2
-rw-r--r--testhal/STM32F4xx/IRQ_STORM_FPU/Makefile2
-rw-r--r--testhal/STM32F4xx/PWM-ICU/Makefile2
-rw-r--r--testhal/STM32F4xx/RTC/Makefile2
-rw-r--r--testhal/STM32F4xx/SDC/Makefile2
-rw-r--r--testhal/STM32F4xx/SPI/Makefile2
-rw-r--r--testhal/STM32F4xx/UART/Makefile2
-rw-r--r--testhal/STM32F4xx/USB_CDC/Makefile2
-rw-r--r--testhal/STM32L1xx/ADC/Makefile2
-rw-r--r--testhal/STM32L1xx/EXT/Makefile2
-rw-r--r--testhal/STM32L1xx/IRQ_STORM/Makefile2
-rw-r--r--testhal/STM32L1xx/PWM-ICU/Makefile2
-rw-r--r--testhal/STM32L1xx/SPI/Makefile2
-rw-r--r--testhal/STM32L1xx/UART/Makefile2
81 files changed, 262 insertions, 500 deletions
diff --git a/demos/nil/NIL-STM32F051-DISCOVERY/.cproject b/demos/nil/NIL-STM32F051-DISCOVERY/.cproject
index 03d7ff75e..d13cd471f 100644
--- a/demos/nil/NIL-STM32F051-DISCOVERY/.cproject
+++ b/demos/nil/NIL-STM32F051-DISCOVERY/.cproject
@@ -42,6 +42,8 @@
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<project id="Nil.null.181931990" name="Nil"/>
</storageModule>
+ <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+ <storageModule moduleId="refreshScope"/>
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
@@ -54,16 +56,6 @@
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
- <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="makefileGenerator">
- <runAction arguments="-E -P -v -dD" command="" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
@@ -94,36 +86,6 @@
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
<scannerConfigBuildInfo instanceId="0.87736009">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
@@ -208,5 +170,4 @@
</profile>
</scannerConfigBuildInfo>
</storageModule>
- <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
</cproject>
diff --git a/demos/nil/NIL-STM32F051-DISCOVERY/Makefile b/demos/nil/NIL-STM32F051-DISCOVERY/Makefile
index 889bc20dc..7a2ecf967 100644
--- a/demos/nil/NIL-STM32F051-DISCOVERY/Makefile
+++ b/demos/nil/NIL-STM32F051-DISCOVERY/Makefile
@@ -73,7 +73,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32F0_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F0xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F0xx/platform.mk
include $(CHIBIOS)/os/hal/osal/nil/osal.mk
include $(CHIBIOS)/os/nil/nil.mk
include $(CHIBIOS)/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk
diff --git a/demos/nil/NIL-STM32F100-DISCOVERY/.cproject b/demos/nil/NIL-STM32F100-DISCOVERY/.cproject
index a32ef55e6..d13cd471f 100644
--- a/demos/nil/NIL-STM32F100-DISCOVERY/.cproject
+++ b/demos/nil/NIL-STM32F100-DISCOVERY/.cproject
@@ -42,6 +42,8 @@
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<project id="Nil.null.181931990" name="Nil"/>
</storageModule>
+ <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+ <storageModule moduleId="refreshScope"/>
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
@@ -54,16 +56,6 @@
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
- <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="makefileGenerator">
- <runAction arguments="-E -P -v -dD" command="" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
@@ -94,36 +86,6 @@
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
<scannerConfigBuildInfo instanceId="0.87736009">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
@@ -208,6 +170,4 @@
</profile>
</scannerConfigBuildInfo>
</storageModule>
- <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
- <storageModule moduleId="refreshScope"/>
</cproject>
diff --git a/demos/nil/NIL-STM32F100-DISCOVERY/Makefile b/demos/nil/NIL-STM32F100-DISCOVERY/Makefile
index 15d624f3b..b6f7b04a5 100644
--- a/demos/nil/NIL-STM32F100-DISCOVERY/Makefile
+++ b/demos/nil/NIL-STM32F100-DISCOVERY/Makefile
@@ -78,8 +78,8 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32VL_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F1xx/platform.mk
-include $(CHIBIOS)/os/hal/nil/osal/osal.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/platform.mk
+include $(CHIBIOS)/os/hal/osal/nil/osal.mk
include $(CHIBIOS)/os/nil/nil.mk
include $(CHIBIOS)/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f1xx.mk
#include $(CHIBIOS)/test/test.mk
diff --git a/demos/nil/NIL-STM32F303-DISCOVERY/Makefile b/demos/nil/NIL-STM32F303-DISCOVERY/Makefile
index 725e17cf5..881f3b7a6 100644
--- a/demos/nil/NIL-STM32F303-DISCOVERY/Makefile
+++ b/demos/nil/NIL-STM32F303-DISCOVERY/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F30x/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F30x/platform.mk
include $(CHIBIOS)/os/hal/osal/nil/osal.mk
include $(CHIBIOS)/os/nil/nil.mk
include $(CHIBIOS)/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk
diff --git a/demos/nil/NIL-STM32F373-STM32373C_EVAL/.cproject b/demos/nil/NIL-STM32F373-STM32373C_EVAL/.cproject
index a32ef55e6..d13cd471f 100644
--- a/demos/nil/NIL-STM32F373-STM32373C_EVAL/.cproject
+++ b/demos/nil/NIL-STM32F373-STM32373C_EVAL/.cproject
@@ -42,6 +42,8 @@
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<project id="Nil.null.181931990" name="Nil"/>
</storageModule>
+ <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+ <storageModule moduleId="refreshScope"/>
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
@@ -54,16 +56,6 @@
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
- <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="makefileGenerator">
- <runAction arguments="-E -P -v -dD" command="" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
@@ -94,36 +86,6 @@
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
<scannerConfigBuildInfo instanceId="0.87736009">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
@@ -208,6 +170,4 @@
</profile>
</scannerConfigBuildInfo>
</storageModule>
- <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
- <storageModule moduleId="refreshScope"/>
</cproject>
diff --git a/demos/nil/NIL-STM32F373-STM32373C_EVAL/Makefile b/demos/nil/NIL-STM32F373-STM32373C_EVAL/Makefile
index 9be09a020..d07e5a072 100644
--- a/demos/nil/NIL-STM32F373-STM32373C_EVAL/Makefile
+++ b/demos/nil/NIL-STM32F373-STM32373C_EVAL/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32373C_EVAL/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F37x/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F37x/platform.mk
include $(CHIBIOS)/os/hal/osal/nil/osal.mk
include $(CHIBIOS)/os/nil/nil.mk
include $(CHIBIOS)/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f37x.mk
diff --git a/demos/nil/NIL-STM32L152-DISCOVERY/.cproject b/demos/nil/NIL-STM32L152-DISCOVERY/.cproject
index a32ef55e6..d13cd471f 100644
--- a/demos/nil/NIL-STM32L152-DISCOVERY/.cproject
+++ b/demos/nil/NIL-STM32L152-DISCOVERY/.cproject
@@ -42,6 +42,8 @@
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<project id="Nil.null.181931990" name="Nil"/>
</storageModule>
+ <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+ <storageModule moduleId="refreshScope"/>
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
@@ -54,16 +56,6 @@
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
- <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="makefileGenerator">
- <runAction arguments="-E -P -v -dD" command="" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
@@ -94,36 +86,6 @@
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
<scannerConfigBuildInfo instanceId="0.87736009">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
@@ -208,6 +170,4 @@
</profile>
</scannerConfigBuildInfo>
</storageModule>
- <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
- <storageModule moduleId="refreshScope"/>
</cproject>
diff --git a/demos/nil/NIL-STM32L152-DISCOVERY/Makefile b/demos/nil/NIL-STM32L152-DISCOVERY/Makefile
index 47e6e991e..fc3436191 100644
--- a/demos/nil/NIL-STM32L152-DISCOVERY/Makefile
+++ b/demos/nil/NIL-STM32L152-DISCOVERY/Makefile
@@ -73,7 +73,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32L_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32L1xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32L1xx/platform.mk
include $(CHIBIOS)/os/hal/osal/nil/osal.mk
include $(CHIBIOS)/os/nil/nil.mk
include $(CHIBIOS)/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32l1xx.mk
diff --git a/demos/rt/RT-STM32F051-DISCOVERY/Makefile b/demos/rt/RT-STM32F051-DISCOVERY/Makefile
index 27319acea..92eeed690 100644
--- a/demos/rt/RT-STM32F051-DISCOVERY/Makefile
+++ b/demos/rt/RT-STM32F051-DISCOVERY/Makefile
@@ -73,7 +73,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32F0_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F0xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F0xx/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk
diff --git a/demos/rt/RT-STM32F100-DISCOVERY/.cproject b/demos/rt/RT-STM32F100-DISCOVERY/.cproject
index a32ef55e6..d13cd471f 100644
--- a/demos/rt/RT-STM32F100-DISCOVERY/.cproject
+++ b/demos/rt/RT-STM32F100-DISCOVERY/.cproject
@@ -42,6 +42,8 @@
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<project id="Nil.null.181931990" name="Nil"/>
</storageModule>
+ <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+ <storageModule moduleId="refreshScope"/>
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
@@ -54,16 +56,6 @@
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
- <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="makefileGenerator">
- <runAction arguments="-E -P -v -dD" command="" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
@@ -94,36 +86,6 @@
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
<scannerConfigBuildInfo instanceId="0.87736009">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
@@ -208,6 +170,4 @@
</profile>
</scannerConfigBuildInfo>
</storageModule>
- <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
- <storageModule moduleId="refreshScope"/>
</cproject>
diff --git a/demos/rt/RT-STM32F100-DISCOVERY/Makefile b/demos/rt/RT-STM32F100-DISCOVERY/Makefile
index e42ec06b5..d0da0e6af 100644
--- a/demos/rt/RT-STM32F100-DISCOVERY/Makefile
+++ b/demos/rt/RT-STM32F100-DISCOVERY/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32VL_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F1xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f1xx.mk
diff --git a/demos/rt/RT-STM32F103-OLIMEX_STM32_P103/.cproject b/demos/rt/RT-STM32F103-OLIMEX_STM32_P103/.cproject
index a32ef55e6..d13cd471f 100644
--- a/demos/rt/RT-STM32F103-OLIMEX_STM32_P103/.cproject
+++ b/demos/rt/RT-STM32F103-OLIMEX_STM32_P103/.cproject
@@ -42,6 +42,8 @@
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<project id="Nil.null.181931990" name="Nil"/>
</storageModule>
+ <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+ <storageModule moduleId="refreshScope"/>
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
@@ -54,16 +56,6 @@
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
- <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="makefileGenerator">
- <runAction arguments="-E -P -v -dD" command="" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
@@ -94,36 +86,6 @@
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
<scannerConfigBuildInfo instanceId="0.87736009">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
@@ -208,6 +170,4 @@
</profile>
</scannerConfigBuildInfo>
</storageModule>
- <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
- <storageModule moduleId="refreshScope"/>
</cproject>
diff --git a/demos/rt/RT-STM32F103-OLIMEX_STM32_P103/Makefile b/demos/rt/RT-STM32F103-OLIMEX_STM32_P103/Makefile
index 283273b08..fd616fc92 100644
--- a/demos/rt/RT-STM32F103-OLIMEX_STM32_P103/Makefile
+++ b/demos/rt/RT-STM32F103-OLIMEX_STM32_P103/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/OLIMEX_STM32_P103/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F1xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f1xx.mk
diff --git a/demos/rt/RT-STM32F303-DISCOVERY/Makefile b/demos/rt/RT-STM32F303-DISCOVERY/Makefile
index ea1a9972a..384fa84ad 100644
--- a/demos/rt/RT-STM32F303-DISCOVERY/Makefile
+++ b/demos/rt/RT-STM32F303-DISCOVERY/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F30x/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F30x/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk
diff --git a/demos/rt/RT-STM32F373-STM32373C_EVAL/.cproject b/demos/rt/RT-STM32F373-STM32373C_EVAL/.cproject
index 062591261..8f961acbc 100644
--- a/demos/rt/RT-STM32F373-STM32373C_EVAL/.cproject
+++ b/demos/rt/RT-STM32F373-STM32373C_EVAL/.cproject
@@ -48,4 +48,5 @@
</scannerConfigBuildInfo>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+ <storageModule moduleId="refreshScope"/>
</cproject>
diff --git a/demos/rt/RT-STM32F373-STM32373C_EVAL/Makefile b/demos/rt/RT-STM32F373-STM32373C_EVAL/Makefile
index bf4820ad1..3eedffb29 100644
--- a/demos/rt/RT-STM32F373-STM32373C_EVAL/Makefile
+++ b/demos/rt/RT-STM32F373-STM32373C_EVAL/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32373C_EVAL/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F37x/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F37x/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f37x.mk
diff --git a/demos/rt/RT-STM32F407-DISCOVERY-MEMS/Makefile b/demos/rt/RT-STM32F407-DISCOVERY-MEMS/Makefile
index d6453bd77..e437203f0 100644
--- a/demos/rt/RT-STM32F407-DISCOVERY-MEMS/Makefile
+++ b/demos/rt/RT-STM32F407-DISCOVERY-MEMS/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F4xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk
diff --git a/demos/rt/RT-STM32F407-DISCOVERY/Makefile b/demos/rt/RT-STM32F407-DISCOVERY/Makefile
index 5e4a3e7b5..143df553b 100644
--- a/demos/rt/RT-STM32F407-DISCOVERY/Makefile
+++ b/demos/rt/RT-STM32F407-DISCOVERY/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F4xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk
diff --git a/demos/rt/RT-STM32F429-DISCOVERY/Makefile b/demos/rt/RT-STM32F429-DISCOVERY/Makefile
index 6d59255a4..f37930afe 100644
--- a/demos/rt/RT-STM32F429-DISCOVERY/Makefile
+++ b/demos/rt/RT-STM32F429-DISCOVERY/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32F429I_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F4xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk
diff --git a/demos/rt/RT-STM32L152-DISCOVERY/Makefile b/demos/rt/RT-STM32L152-DISCOVERY/Makefile
index 86b8cf162..3ee724b86 100644
--- a/demos/rt/RT-STM32L152-DISCOVERY/Makefile
+++ b/demos/rt/RT-STM32L152-DISCOVERY/Makefile
@@ -73,7 +73,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32L_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32L1xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32L1xx/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32l1xx.mk
diff --git a/os/hal/ports/STM32/STM32F0xx/platform.mk b/os/hal/ports/STM32/STM32F0xx/platform.mk
index df5dbc321..3c4d9baf5 100644
--- a/os/hal/ports/STM32/STM32F0xx/platform.mk
+++ b/os/hal/ports/STM32/STM32F0xx/platform.mk
@@ -1,28 +1,28 @@
# List of all the STM32F0xx platform files.
PLATFORMSRC = ${CHIBIOS}/os/hal/ports/common/ARMCMx/nvic.c \
- ${CHIBIOS}/os/hal/ports/STM32F0xx/stm32_dma.c \
- ${CHIBIOS}/os/hal/ports/STM32F0xx/hal_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32F0xx/adc_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32F0xx/ext_lld_isr.c \
- ${CHIBIOS}/os/hal/ports/STM32/ext_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/GPIOv2/pal_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/I2Cv2/i2c_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/SPIv2/spi_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/TIMv1/gpt_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/TIMv1/icu_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/TIMv1/pwm_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/TIMv1/st_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/USARTv2/serial_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/USARTv2/uart_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/USBv1/usb_lld.c
+ ${CHIBIOS}/os/hal/ports/STM32/STM32F0xx/stm32_dma.c \
+ ${CHIBIOS}/os/hal/ports/STM32/STM32F0xx/hal_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/STM32F0xx/adc_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/STM32F0xx/ext_lld_isr.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/ext_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/GPIOv2/pal_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/I2Cv2/i2c_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/SPIv2/spi_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/TIMv1/gpt_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/TIMv1/icu_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/TIMv1/pwm_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/TIMv1/st_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/USARTv2/serial_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/USARTv2/uart_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/USBv1/usb_lld.c
# Required include directories
PLATFORMINC = ${CHIBIOS}/os/hal/ports/common/ARMCMx \
- ${CHIBIOS}/os/hal/ports/STM32F0xx \
- ${CHIBIOS}/os/hal/ports/STM32 \
- ${CHIBIOS}/os/hal/ports/STM32/GPIOv2 \
- ${CHIBIOS}/os/hal/ports/STM32/I2Cv2 \
- ${CHIBIOS}/os/hal/ports/STM32/SPIv2 \
- ${CHIBIOS}/os/hal/ports/STM32/TIMv1 \
- ${CHIBIOS}/os/hal/ports/STM32/USARTv2 \
- ${CHIBIOS}/os/hal/ports/STM32/USBv1
+ ${CHIBIOS}/os/hal/ports/STM32/STM32F0xx \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/GPIOv2 \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/I2Cv2 \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/SPIv2 \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/TIMv1 \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/USARTv2 \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/USBv1
diff --git a/os/hal/ports/STM32/STM32F1xx/platform.mk b/os/hal/ports/STM32/STM32F1xx/platform.mk
index 7b3efd83f..daff671f2 100644
--- a/os/hal/ports/STM32/STM32F1xx/platform.mk
+++ b/os/hal/ports/STM32/STM32F1xx/platform.mk
@@ -1,34 +1,34 @@
# List of all the STM32F1xx platform files.
PLATFORMSRC = ${CHIBIOS}/os/hal/ports/common/ARMCMx/nvic.c \
- ${CHIBIOS}/os/hal/ports/STM32F1xx/stm32_dma.c \
- ${CHIBIOS}/os/hal/ports/STM32F1xx/hal_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32F1xx/adc_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32F1xx/ext_lld_isr.c \
- ${CHIBIOS}/os/hal/ports/STM32/can_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/ext_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/mac_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/sdc_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/GPIOv1/pal_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/I2Cv1/i2c_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/RTCv1/rtc_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/SPIv1/spi_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/TIMv1/gpt_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/TIMv1/icu_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/TIMv1/pwm_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/TIMv1/st_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/USARTv1/serial_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/USARTv1/uart_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/USBv1/usb_lld.c
+ ${CHIBIOS}/os/hal/ports/STM32/STM32F1xx/stm32_dma.c \
+ ${CHIBIOS}/os/hal/ports/STM32/STM32F1xx/hal_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/STM32F1xx/adc_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/STM32F1xx/ext_lld_isr.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/can_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/ext_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/mac_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/sdc_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/GPIOv1/pal_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/I2Cv1/i2c_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/RTCv1/rtc_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/SPIv1/spi_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/TIMv1/gpt_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/TIMv1/icu_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/TIMv1/pwm_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/TIMv1/st_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/USARTv1/serial_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/USARTv1/uart_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/USBv1/usb_lld.c
# Required include directories
PLATFORMINC = ${CHIBIOS}/os/hal/ports/common/ARMCMx \
- ${CHIBIOS}/os/hal/ports/STM32F1xx \
- ${CHIBIOS}/os/hal/ports/STM32 \
- ${CHIBIOS}/os/hal/ports/STM32/GPIOv1 \
- ${CHIBIOS}/os/hal/ports/STM32/I2Cv1 \
- ${CHIBIOS}/os/hal/ports/STM32/RTCv1 \
- ${CHIBIOS}/os/hal/ports/STM32/SPIv1 \
- ${CHIBIOS}/os/hal/ports/STM32/TIMv1 \
- ${CHIBIOS}/os/hal/ports/STM32/USARTv1 \
- ${CHIBIOS}/os/hal/ports/STM32/USBv1
+ ${CHIBIOS}/os/hal/ports/STM32/STM32F1xx \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/GPIOv1 \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/I2Cv1 \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/RTCv1 \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/SPIv1 \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/TIMv1 \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/USARTv1 \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/USBv1
diff --git a/os/hal/ports/STM32/STM32F1xx/platform_f105_f107.mk b/os/hal/ports/STM32/STM32F1xx/platform_f105_f107.mk
index c0264dd3a..267f78599 100644
--- a/os/hal/ports/STM32/STM32F1xx/platform_f105_f107.mk
+++ b/os/hal/ports/STM32/STM32F1xx/platform_f105_f107.mk
@@ -1,32 +1,32 @@
# List of all the STM32F1xx platform files.
PLATFORMSRC = ${CHIBIOS}/os/hal/ports/common/ARMCMx/nvic.c \
- ${CHIBIOS}/os/hal/ports/STM32F1xx/stm32_dma.c \
- ${CHIBIOS}/os/hal/ports/STM32F1xx/hal_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32F1xx/adc_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32F1xx/ext_lld_isr.c \
- ${CHIBIOS}/os/hal/ports/STM32/can_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/ext_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/mac_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/sdc_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/GPIOv1/pal_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/I2Cv1/i2c_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/RTCv1/rtc_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/SPIv1/spi_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/TIMv1/gpt_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/TIMv1/icu_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/TIMv1/pwm_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/USARTv1/serial_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/USARTv1/uart_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/OTGv1/usb_lld.c
+ ${CHIBIOS}/os/hal/ports/STM32/STM32F1xx/stm32_dma.c \
+ ${CHIBIOS}/os/hal/ports/STM32/STM32F1xx/hal_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/STM32F1xx/adc_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/STM32F1xx/ext_lld_isr.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/can_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/ext_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/mac_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/sdc_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/GPIOv1/pal_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/I2Cv1/i2c_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/RTCv1/rtc_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/SPIv1/spi_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/TIMv1/gpt_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/TIMv1/icu_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/TIMv1/pwm_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/USARTv1/serial_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/USARTv1/uart_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/OTGv1/usb_lld.c
# Required include directories
PLATFORMINC = ${CHIBIOS}/os/hal/ports/common/ARMCMx \
- ${CHIBIOS}/os/hal/ports/STM32F1xx \
- ${CHIBIOS}/os/hal/ports/STM32 \
- ${CHIBIOS}/os/hal/ports/STM32/GPIOv1 \
- ${CHIBIOS}/os/hal/ports/STM32/I2Cv1 \
- ${CHIBIOS}/os/hal/ports/STM32/RTCv1 \
- ${CHIBIOS}/os/hal/ports/STM32/SPIv1 \
- ${CHIBIOS}/os/hal/ports/STM32/TIMv1 \
- ${CHIBIOS}/os/hal/ports/STM32/USARTv1 \
- ${CHIBIOS}/os/hal/ports/STM32/OTGv1
+ ${CHIBIOS}/os/hal/ports/STM32/STM32F1xx \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/GPIOv1 \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/I2Cv1 \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/RTCv1 \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/SPIv1 \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/TIMv1 \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/USARTv1 \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/OTGv1
diff --git a/os/hal/ports/STM32/STM32F30x/platform.mk b/os/hal/ports/STM32/STM32F30x/platform.mk
index fabc8032f..f24aee535 100644
--- a/os/hal/ports/STM32/STM32F30x/platform.mk
+++ b/os/hal/ports/STM32/STM32F30x/platform.mk
@@ -1,31 +1,31 @@
# List of all the STM32F30x platform files.
PLATFORMSRC = ${CHIBIOS}/os/hal/ports/common/ARMCMx/nvic.c \
- ${CHIBIOS}/os/hal/ports/STM32F30x/stm32_dma.c \
- ${CHIBIOS}/os/hal/ports/STM32F30x/hal_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32F30x/adc_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32F30x/ext_lld_isr.c \
- ${CHIBIOS}/os/hal/ports/STM32/can_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/ext_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/GPIOv2/pal_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/I2Cv2/i2c_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/RTCv2/rtc_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/SPIv2/spi_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/TIMv1/gpt_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/TIMv1/icu_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/TIMv1/pwm_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/TIMv1/st_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/USARTv2/serial_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/USARTv2/uart_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/USBv1/usb_lld.c
+ ${CHIBIOS}/os/hal/ports/STM32/STM32F30x/stm32_dma.c \
+ ${CHIBIOS}/os/hal/ports/STM32/STM32F30x/hal_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/STM32F30x/adc_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/STM32F30x/ext_lld_isr.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/can_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/ext_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/GPIOv2/pal_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/I2Cv2/i2c_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/RTCv2/rtc_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/SPIv2/spi_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/TIMv1/gpt_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/TIMv1/icu_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/TIMv1/pwm_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/TIMv1/st_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/USARTv2/serial_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/USARTv2/uart_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/USBv1/usb_lld.c
# Required include directories
PLATFORMINC = ${CHIBIOS}/os/hal/ports/common/ARMCMx \
- ${CHIBIOS}/os/hal/ports/STM32F30x \
- ${CHIBIOS}/os/hal/ports/STM32 \
- ${CHIBIOS}/os/hal/ports/STM32/GPIOv2 \
- ${CHIBIOS}/os/hal/ports/STM32/I2Cv2 \
- ${CHIBIOS}/os/hal/ports/STM32/RTCv2 \
- ${CHIBIOS}/os/hal/ports/STM32/SPIv2 \
- ${CHIBIOS}/os/hal/ports/STM32/TIMv1 \
- ${CHIBIOS}/os/hal/ports/STM32/USARTv2 \
- ${CHIBIOS}/os/hal/ports/STM32/USBv1
+ ${CHIBIOS}/os/hal/ports/STM32/STM32F30x \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/GPIOv2 \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/I2Cv2 \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/RTCv2 \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/SPIv2 \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/TIMv1 \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/USARTv2 \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/USBv1
diff --git a/os/hal/ports/STM32/STM32F37x/platform.mk b/os/hal/ports/STM32/STM32F37x/platform.mk
index fbcaaa80f..07dcf38af 100644
--- a/os/hal/ports/STM32/STM32F37x/platform.mk
+++ b/os/hal/ports/STM32/STM32F37x/platform.mk
@@ -1,31 +1,31 @@
# List of all the STM32F37x platform files.
PLATFORMSRC = ${CHIBIOS}/os/hal/ports/common/ARMCMx/nvic.c \
- ${CHIBIOS}/os/hal/ports/STM32F37x/stm32_dma.c \
- ${CHIBIOS}/os/hal/ports/STM32F37x/hal_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32F37x/adc_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32F37x/ext_lld_isr.c \
- ${CHIBIOS}/os/hal/ports/STM32/can_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/ext_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/GPIOv2/pal_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/I2Cv2/i2c_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/RTCv2/rtc_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/SPIv2/spi_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/TIMv1/gpt_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/TIMv1/icu_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/TIMv1/pwm_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/TIMv1/st_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/USARTv2/serial_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/USARTv2/uart_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/USBv1/usb_lld.c
+ ${CHIBIOS}/os/hal/ports/STM32/STM32F37x/stm32_dma.c \
+ ${CHIBIOS}/os/hal/ports/STM32/STM32F37x/hal_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/STM32F37x/adc_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/STM32F37x/ext_lld_isr.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/can_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/ext_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/GPIOv2/pal_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/I2Cv2/i2c_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/RTCv2/rtc_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/SPIv2/spi_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/TIMv1/gpt_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/TIMv1/icu_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/TIMv1/pwm_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/TIMv1/st_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/USARTv2/serial_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/USARTv2/uart_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/USBv1/usb_lld.c
# Required include directories
PLATFORMINC = ${CHIBIOS}/os/hal/ports/common/ARMCMx \
- ${CHIBIOS}/os/hal/ports/STM32F37x \
- ${CHIBIOS}/os/hal/ports/STM32 \
- ${CHIBIOS}/os/hal/ports/STM32/GPIOv2 \
- ${CHIBIOS}/os/hal/ports/STM32/I2Cv2 \
- ${CHIBIOS}/os/hal/ports/STM32/RTCv2 \
- ${CHIBIOS}/os/hal/ports/STM32/SPIv2 \
- ${CHIBIOS}/os/hal/ports/STM32/TIMv1 \
- ${CHIBIOS}/os/hal/ports/STM32/USARTv2 \
- ${CHIBIOS}/os/hal/ports/STM32/USBv1
+ ${CHIBIOS}/os/hal/ports/STM32/STM32F37x \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/GPIOv2 \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/I2Cv2 \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/RTCv2 \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/SPIv2 \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/TIMv1 \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/USARTv2 \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/USBv1
diff --git a/os/hal/ports/STM32/STM32F4xx/platform.mk b/os/hal/ports/STM32/STM32F4xx/platform.mk
index d91d96409..cfbe44433 100644
--- a/os/hal/ports/STM32/STM32F4xx/platform.mk
+++ b/os/hal/ports/STM32/STM32F4xx/platform.mk
@@ -1,33 +1,33 @@
# List of all the STM32F2xx/STM32F4xx platform files.
PLATFORMSRC = ${CHIBIOS}/os/hal/ports/common/ARMCMx/nvic.c \
- ${CHIBIOS}/os/hal/ports/STM32F4xx/stm32_dma.c \
- ${CHIBIOS}/os/hal/ports/STM32F4xx/hal_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32F4xx/adc_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32F4xx/ext_lld_isr.c \
- ${CHIBIOS}/os/hal/ports/STM32/can_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/ext_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/mac_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/sdc_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/GPIOv2/pal_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/I2Cv1/i2c_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/OTGv1/usb_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/RTCv2/rtc_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/SPIv1/spi_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/TIMv1/gpt_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/TIMv1/icu_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/TIMv1/pwm_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/TIMv1/st_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/USARTv1/serial_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/USARTv1/uart_lld.c
+ ${CHIBIOS}/os/hal/ports/STM32/STM32F4xx/stm32_dma.c \
+ ${CHIBIOS}/os/hal/ports/STM32/STM32F4xx/hal_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/STM32F4xx/adc_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/STM32F4xx/ext_lld_isr.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/can_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/ext_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/mac_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/sdc_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/GPIOv2/pal_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/I2Cv1/i2c_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/OTGv1/usb_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/RTCv2/rtc_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/SPIv1/spi_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/TIMv1/gpt_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/TIMv1/icu_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/TIMv1/pwm_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/TIMv1/st_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/USARTv1/serial_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/USARTv1/uart_lld.c
# Required include directories
PLATFORMINC = ${CHIBIOS}/os/hal/ports/common/ARMCMx \
- ${CHIBIOS}/os/hal/ports/STM32F4xx \
- ${CHIBIOS}/os/hal/ports/STM32 \
- ${CHIBIOS}/os/hal/ports/STM32/GPIOv2 \
- ${CHIBIOS}/os/hal/ports/STM32/I2Cv1 \
- ${CHIBIOS}/os/hal/ports/STM32/OTGv1 \
- ${CHIBIOS}/os/hal/ports/STM32/RTCv2 \
- ${CHIBIOS}/os/hal/ports/STM32/SPIv1 \
- ${CHIBIOS}/os/hal/ports/STM32/TIMv1 \
- ${CHIBIOS}/os/hal/ports/STM32/USARTv1
+ ${CHIBIOS}/os/hal/ports/STM32/STM32F4xx \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/GPIOv2 \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/I2Cv1 \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/OTGv1 \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/RTCv2 \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/SPIv1 \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/TIMv1 \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/USARTv1
diff --git a/os/hal/ports/STM32/STM32L1xx/platform.mk b/os/hal/ports/STM32/STM32L1xx/platform.mk
index 4104e3369..adf6de40f 100644
--- a/os/hal/ports/STM32/STM32L1xx/platform.mk
+++ b/os/hal/ports/STM32/STM32L1xx/platform.mk
@@ -1,28 +1,28 @@
# List of all the STM32L1xx platform files.
PLATFORMSRC = ${CHIBIOS}/os/hal/ports/common/ARMCMx/nvic.c \
- ${CHIBIOS}/os/hal/ports/STM32L1xx/stm32_dma.c \
- ${CHIBIOS}/os/hal/ports/STM32L1xx/hal_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32L1xx/adc_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32L1xx/ext_lld_isr.c \
- ${CHIBIOS}/os/hal/ports/STM32/ext_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/GPIOv2/pal_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/I2Cv1/i2c_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/SPIv1/spi_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/TIMv1/gpt_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/TIMv1/icu_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/TIMv1/pwm_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/TIMv1/st_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/USARTv1/serial_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/USARTv1/uart_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/USBv1/usb_lld.c
+ ${CHIBIOS}/os/hal/ports/STM32/STM32L1xx/stm32_dma.c \
+ ${CHIBIOS}/os/hal/ports/STM32/STM32L1xx/hal_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/STM32L1xx/adc_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/STM32L1xx/ext_lld_isr.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/ext_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/GPIOv2/pal_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/I2Cv1/i2c_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/SPIv1/spi_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/TIMv1/gpt_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/TIMv1/icu_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/TIMv1/pwm_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/TIMv1/st_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/USARTv1/serial_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/USARTv1/uart_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/USBv1/usb_lld.c
# Required include directories
PLATFORMINC = ${CHIBIOS}/os/hal/ports/common/ARMCMx \
- ${CHIBIOS}/os/hal/ports/STM32L1xx \
- ${CHIBIOS}/os/hal/ports/STM32 \
- ${CHIBIOS}/os/hal/ports/STM32/GPIOv2 \
- ${CHIBIOS}/os/hal/ports/STM32/I2Cv1 \
- ${CHIBIOS}/os/hal/ports/STM32/SPIv1 \
- ${CHIBIOS}/os/hal/ports/STM32/TIMv1 \
- ${CHIBIOS}/os/hal/ports/STM32/USARTv1 \
- ${CHIBIOS}/os/hal/ports/STM32/USBv1
+ ${CHIBIOS}/os/hal/ports/STM32/STM32L1xx \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/GPIOv2 \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/I2Cv1 \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/SPIv1 \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/TIMv1 \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/USARTv1 \
+ ${CHIBIOS}/os/hal/ports/STM32/LLD/USBv1
diff --git a/testhal/STM32F0xx/ADC/Makefile b/testhal/STM32F0xx/ADC/Makefile
index 5ae43f5dc..a89e1f911 100644
--- a/testhal/STM32F0xx/ADC/Makefile
+++ b/testhal/STM32F0xx/ADC/Makefile
@@ -73,7 +73,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32F0_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F0xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F0xx/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk
diff --git a/testhal/STM32F0xx/EXT/Makefile b/testhal/STM32F0xx/EXT/Makefile
index 5ae43f5dc..a89e1f911 100644
--- a/testhal/STM32F0xx/EXT/Makefile
+++ b/testhal/STM32F0xx/EXT/Makefile
@@ -73,7 +73,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32F0_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F0xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F0xx/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk
diff --git a/testhal/STM32F0xx/IRQ_STORM/Makefile b/testhal/STM32F0xx/IRQ_STORM/Makefile
index 5ae43f5dc..a89e1f911 100644
--- a/testhal/STM32F0xx/IRQ_STORM/Makefile
+++ b/testhal/STM32F0xx/IRQ_STORM/Makefile
@@ -73,7 +73,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32F0_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F0xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F0xx/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk
diff --git a/testhal/STM32F0xx/PWM-ICU/Makefile b/testhal/STM32F0xx/PWM-ICU/Makefile
index 5ae43f5dc..a89e1f911 100644
--- a/testhal/STM32F0xx/PWM-ICU/Makefile
+++ b/testhal/STM32F0xx/PWM-ICU/Makefile
@@ -73,7 +73,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32F0_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F0xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F0xx/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk
diff --git a/testhal/STM32F0xx/SPI/Makefile b/testhal/STM32F0xx/SPI/Makefile
index 5ae43f5dc..a89e1f911 100644
--- a/testhal/STM32F0xx/SPI/Makefile
+++ b/testhal/STM32F0xx/SPI/Makefile
@@ -73,7 +73,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32F0_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F0xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F0xx/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk
diff --git a/testhal/STM32F0xx/UART/Makefile b/testhal/STM32F0xx/UART/Makefile
index 5ae43f5dc..a89e1f911 100644
--- a/testhal/STM32F0xx/UART/Makefile
+++ b/testhal/STM32F0xx/UART/Makefile
@@ -73,7 +73,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32F0_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F0xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F0xx/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk
diff --git a/testhal/STM32F1xx/ADC/Makefile b/testhal/STM32F1xx/ADC/Makefile
index 573d47627..b49ee13b3 100644
--- a/testhal/STM32F1xx/ADC/Makefile
+++ b/testhal/STM32F1xx/ADC/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/OLIMEX_STM32_P103/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F1xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f1xx.mk
diff --git a/testhal/STM32F1xx/CAN/Makefile b/testhal/STM32F1xx/CAN/Makefile
index 573d47627..b49ee13b3 100644
--- a/testhal/STM32F1xx/CAN/Makefile
+++ b/testhal/STM32F1xx/CAN/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/OLIMEX_STM32_P103/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F1xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f1xx.mk
diff --git a/testhal/STM32F1xx/EXT/Makefile b/testhal/STM32F1xx/EXT/Makefile
index 573d47627..b49ee13b3 100644
--- a/testhal/STM32F1xx/EXT/Makefile
+++ b/testhal/STM32F1xx/EXT/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/OLIMEX_STM32_P103/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F1xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f1xx.mk
diff --git a/testhal/STM32F1xx/IRQ_STORM/Makefile b/testhal/STM32F1xx/IRQ_STORM/Makefile
index 573d47627..b49ee13b3 100644
--- a/testhal/STM32F1xx/IRQ_STORM/Makefile
+++ b/testhal/STM32F1xx/IRQ_STORM/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/OLIMEX_STM32_P103/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F1xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f1xx.mk
diff --git a/testhal/STM32F1xx/PWM-ICU/Makefile b/testhal/STM32F1xx/PWM-ICU/Makefile
index 573d47627..b49ee13b3 100644
--- a/testhal/STM32F1xx/PWM-ICU/Makefile
+++ b/testhal/STM32F1xx/PWM-ICU/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/OLIMEX_STM32_P103/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F1xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f1xx.mk
diff --git a/testhal/STM32F1xx/SPI/Makefile b/testhal/STM32F1xx/SPI/Makefile
index 573d47627..b49ee13b3 100644
--- a/testhal/STM32F1xx/SPI/Makefile
+++ b/testhal/STM32F1xx/SPI/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/OLIMEX_STM32_P103/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F1xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f1xx.mk
diff --git a/testhal/STM32F1xx/UART/Makefile b/testhal/STM32F1xx/UART/Makefile
index 573d47627..b49ee13b3 100644
--- a/testhal/STM32F1xx/UART/Makefile
+++ b/testhal/STM32F1xx/UART/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/OLIMEX_STM32_P103/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F1xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f1xx.mk
diff --git a/testhal/STM32F1xx/USB_CDC/Makefile b/testhal/STM32F1xx/USB_CDC/Makefile
index 8ad875ef7..1953600d4 100644
--- a/testhal/STM32F1xx/USB_CDC/Makefile
+++ b/testhal/STM32F1xx/USB_CDC/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/OLIMEX_STM32_P103/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F1xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f1xx.mk
diff --git a/testhal/STM32F30x/ADC/Makefile b/testhal/STM32F30x/ADC/Makefile
index 8e6a1853a..c9f5bbaf3 100644
--- a/testhal/STM32F30x/ADC/Makefile
+++ b/testhal/STM32F30x/ADC/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F30x/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F30x/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk
diff --git a/testhal/STM32F30x/ADC_DUAL/Makefile b/testhal/STM32F30x/ADC_DUAL/Makefile
index 8e6a1853a..c9f5bbaf3 100644
--- a/testhal/STM32F30x/ADC_DUAL/Makefile
+++ b/testhal/STM32F30x/ADC_DUAL/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F30x/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F30x/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk
diff --git a/testhal/STM32F30x/CAN/Makefile b/testhal/STM32F30x/CAN/Makefile
index 8e6a1853a..c9f5bbaf3 100644
--- a/testhal/STM32F30x/CAN/Makefile
+++ b/testhal/STM32F30x/CAN/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F30x/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F30x/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk
diff --git a/testhal/STM32F30x/EXT/Makefile b/testhal/STM32F30x/EXT/Makefile
index 8e6a1853a..c9f5bbaf3 100644
--- a/testhal/STM32F30x/EXT/Makefile
+++ b/testhal/STM32F30x/EXT/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F30x/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F30x/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk
diff --git a/testhal/STM32F30x/IRQ_STORM/Makefile b/testhal/STM32F30x/IRQ_STORM/Makefile
index 8e6a1853a..c9f5bbaf3 100644
--- a/testhal/STM32F30x/IRQ_STORM/Makefile
+++ b/testhal/STM32F30x/IRQ_STORM/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F30x/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F30x/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk
diff --git a/testhal/STM32F30x/PWM-ICU/Makefile b/testhal/STM32F30x/PWM-ICU/Makefile
index 8e6a1853a..c9f5bbaf3 100644
--- a/testhal/STM32F30x/PWM-ICU/Makefile
+++ b/testhal/STM32F30x/PWM-ICU/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F30x/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F30x/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk
diff --git a/testhal/STM32F30x/SPI/Makefile b/testhal/STM32F30x/SPI/Makefile
index 8e6a1853a..c9f5bbaf3 100644
--- a/testhal/STM32F30x/SPI/Makefile
+++ b/testhal/STM32F30x/SPI/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F30x/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F30x/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk
diff --git a/testhal/STM32F30x/UART/Makefile b/testhal/STM32F30x/UART/Makefile
index 8e6a1853a..c9f5bbaf3 100644
--- a/testhal/STM32F30x/UART/Makefile
+++ b/testhal/STM32F30x/UART/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F30x/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F30x/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk
diff --git a/testhal/STM32F30x/USB_CDC/Makefile b/testhal/STM32F30x/USB_CDC/Makefile
index 86b922b66..3f6132a80 100644
--- a/testhal/STM32F30x/USB_CDC/Makefile
+++ b/testhal/STM32F30x/USB_CDC/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F30x/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F30x/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk
diff --git a/testhal/STM32F37x/ADC/Makefile b/testhal/STM32F37x/ADC/Makefile
index bf4820ad1..3eedffb29 100644
--- a/testhal/STM32F37x/ADC/Makefile
+++ b/testhal/STM32F37x/ADC/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32373C_EVAL/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F37x/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F37x/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f37x.mk
diff --git a/testhal/STM32F37x/CAN/Makefile b/testhal/STM32F37x/CAN/Makefile
index bf4820ad1..3eedffb29 100644
--- a/testhal/STM32F37x/CAN/Makefile
+++ b/testhal/STM32F37x/CAN/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32373C_EVAL/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F37x/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F37x/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f37x.mk
diff --git a/testhal/STM32F37x/EXT/Makefile b/testhal/STM32F37x/EXT/Makefile
index bf4820ad1..3eedffb29 100644
--- a/testhal/STM32F37x/EXT/Makefile
+++ b/testhal/STM32F37x/EXT/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32373C_EVAL/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F37x/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F37x/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f37x.mk
diff --git a/testhal/STM32F37x/I2C/Makefile b/testhal/STM32F37x/I2C/Makefile
index bf4820ad1..3eedffb29 100644
--- a/testhal/STM32F37x/I2C/Makefile
+++ b/testhal/STM32F37x/I2C/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32373C_EVAL/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F37x/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F37x/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f37x.mk
diff --git a/testhal/STM32F37x/IRQ_STORM/Makefile b/testhal/STM32F37x/IRQ_STORM/Makefile
index bf4820ad1..3eedffb29 100644
--- a/testhal/STM32F37x/IRQ_STORM/Makefile
+++ b/testhal/STM32F37x/IRQ_STORM/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32373C_EVAL/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F37x/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F37x/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f37x.mk
diff --git a/testhal/STM32F37x/PWM-ICU/Makefile b/testhal/STM32F37x/PWM-ICU/Makefile
index bf4820ad1..3eedffb29 100644
--- a/testhal/STM32F37x/PWM-ICU/Makefile
+++ b/testhal/STM32F37x/PWM-ICU/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32373C_EVAL/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F37x/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F37x/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f37x.mk
diff --git a/testhal/STM32F37x/SDADC/Makefile b/testhal/STM32F37x/SDADC/Makefile
index bf4820ad1..3eedffb29 100644
--- a/testhal/STM32F37x/SDADC/Makefile
+++ b/testhal/STM32F37x/SDADC/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32373C_EVAL/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F37x/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F37x/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f37x.mk
diff --git a/testhal/STM32F37x/SPI/Makefile b/testhal/STM32F37x/SPI/Makefile
index bf4820ad1..3eedffb29 100644
--- a/testhal/STM32F37x/SPI/Makefile
+++ b/testhal/STM32F37x/SPI/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32373C_EVAL/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F37x/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F37x/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f37x.mk
diff --git a/testhal/STM32F37x/UART/Makefile b/testhal/STM32F37x/UART/Makefile
index bf4820ad1..3eedffb29 100644
--- a/testhal/STM32F37x/UART/Makefile
+++ b/testhal/STM32F37x/UART/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32373C_EVAL/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F37x/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F37x/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f37x.mk
diff --git a/testhal/STM32F37x/USB_CDC/Makefile b/testhal/STM32F37x/USB_CDC/Makefile
index d1cd30af9..6402336e8 100644
--- a/testhal/STM32F37x/USB_CDC/Makefile
+++ b/testhal/STM32F37x/USB_CDC/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32373C_EVAL/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F37x/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F37x/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f37x.mk
diff --git a/testhal/STM32F4xx/ADC/Makefile b/testhal/STM32F4xx/ADC/Makefile
index adc25205e..ea6defde6 100644
--- a/testhal/STM32F4xx/ADC/Makefile
+++ b/testhal/STM32F4xx/ADC/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F4xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk
diff --git a/testhal/STM32F4xx/CAN/Makefile b/testhal/STM32F4xx/CAN/Makefile
index adc25205e..ea6defde6 100644
--- a/testhal/STM32F4xx/CAN/Makefile
+++ b/testhal/STM32F4xx/CAN/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F4xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk
diff --git a/testhal/STM32F4xx/DMA_STORM/Makefile b/testhal/STM32F4xx/DMA_STORM/Makefile
index adc25205e..ea6defde6 100644
--- a/testhal/STM32F4xx/DMA_STORM/Makefile
+++ b/testhal/STM32F4xx/DMA_STORM/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F4xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk
diff --git a/testhal/STM32F4xx/EXT/Makefile b/testhal/STM32F4xx/EXT/Makefile
index adc25205e..ea6defde6 100644
--- a/testhal/STM32F4xx/EXT/Makefile
+++ b/testhal/STM32F4xx/EXT/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F4xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk
diff --git a/testhal/STM32F4xx/GPT/Makefile b/testhal/STM32F4xx/GPT/Makefile
index adc25205e..ea6defde6 100644
--- a/testhal/STM32F4xx/GPT/Makefile
+++ b/testhal/STM32F4xx/GPT/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F4xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk
diff --git a/testhal/STM32F4xx/I2C/Makefile b/testhal/STM32F4xx/I2C/Makefile
index ef32358b0..20d143e33 100644
--- a/testhal/STM32F4xx/I2C/Makefile
+++ b/testhal/STM32F4xx/I2C/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/NONSTANDARD_STM32F4_BARTHESS1/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F4xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk
diff --git a/testhal/STM32F4xx/IRQ_STORM/Makefile b/testhal/STM32F4xx/IRQ_STORM/Makefile
index adc25205e..ea6defde6 100644
--- a/testhal/STM32F4xx/IRQ_STORM/Makefile
+++ b/testhal/STM32F4xx/IRQ_STORM/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F4xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk
diff --git a/testhal/STM32F4xx/IRQ_STORM_FPU/Makefile b/testhal/STM32F4xx/IRQ_STORM_FPU/Makefile
index 87bca5f1b..733cdbdd4 100644
--- a/testhal/STM32F4xx/IRQ_STORM_FPU/Makefile
+++ b/testhal/STM32F4xx/IRQ_STORM_FPU/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F4xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk
diff --git a/testhal/STM32F4xx/PWM-ICU/Makefile b/testhal/STM32F4xx/PWM-ICU/Makefile
index adc25205e..ea6defde6 100644
--- a/testhal/STM32F4xx/PWM-ICU/Makefile
+++ b/testhal/STM32F4xx/PWM-ICU/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F4xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk
diff --git a/testhal/STM32F4xx/RTC/Makefile b/testhal/STM32F4xx/RTC/Makefile
index 1bc72c702..28310e604 100644
--- a/testhal/STM32F4xx/RTC/Makefile
+++ b/testhal/STM32F4xx/RTC/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/NONSTANDARD_STM32F4_BARTHESS1/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F4xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk
diff --git a/testhal/STM32F4xx/SDC/Makefile b/testhal/STM32F4xx/SDC/Makefile
index 6c6305490..7cc4fc5d3 100644
--- a/testhal/STM32F4xx/SDC/Makefile
+++ b/testhal/STM32F4xx/SDC/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/OLIMEX_STM32_E407/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F4xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk
diff --git a/testhal/STM32F4xx/SPI/Makefile b/testhal/STM32F4xx/SPI/Makefile
index adc25205e..ea6defde6 100644
--- a/testhal/STM32F4xx/SPI/Makefile
+++ b/testhal/STM32F4xx/SPI/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F4xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk
diff --git a/testhal/STM32F4xx/UART/Makefile b/testhal/STM32F4xx/UART/Makefile
index adc25205e..ea6defde6 100644
--- a/testhal/STM32F4xx/UART/Makefile
+++ b/testhal/STM32F4xx/UART/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F4xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk
diff --git a/testhal/STM32F4xx/USB_CDC/Makefile b/testhal/STM32F4xx/USB_CDC/Makefile
index 359bdb710..0951f0072 100644
--- a/testhal/STM32F4xx/USB_CDC/Makefile
+++ b/testhal/STM32F4xx/USB_CDC/Makefile
@@ -78,7 +78,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/OLIMEX_STM32_E407/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32F4xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk
diff --git a/testhal/STM32L1xx/ADC/Makefile b/testhal/STM32L1xx/ADC/Makefile
index 0a977de72..bbbb15924 100644
--- a/testhal/STM32L1xx/ADC/Makefile
+++ b/testhal/STM32L1xx/ADC/Makefile
@@ -73,7 +73,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32L_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32L1xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32L1xx/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32l1xx.mk
diff --git a/testhal/STM32L1xx/EXT/Makefile b/testhal/STM32L1xx/EXT/Makefile
index 0a977de72..bbbb15924 100644
--- a/testhal/STM32L1xx/EXT/Makefile
+++ b/testhal/STM32L1xx/EXT/Makefile
@@ -73,7 +73,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32L_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32L1xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32L1xx/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32l1xx.mk
diff --git a/testhal/STM32L1xx/IRQ_STORM/Makefile b/testhal/STM32L1xx/IRQ_STORM/Makefile
index 0a977de72..bbbb15924 100644
--- a/testhal/STM32L1xx/IRQ_STORM/Makefile
+++ b/testhal/STM32L1xx/IRQ_STORM/Makefile
@@ -73,7 +73,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32L_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32L1xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32L1xx/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32l1xx.mk
diff --git a/testhal/STM32L1xx/PWM-ICU/Makefile b/testhal/STM32L1xx/PWM-ICU/Makefile
index 0a977de72..bbbb15924 100644
--- a/testhal/STM32L1xx/PWM-ICU/Makefile
+++ b/testhal/STM32L1xx/PWM-ICU/Makefile
@@ -73,7 +73,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32L_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32L1xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32L1xx/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32l1xx.mk
diff --git a/testhal/STM32L1xx/SPI/Makefile b/testhal/STM32L1xx/SPI/Makefile
index 0a977de72..bbbb15924 100644
--- a/testhal/STM32L1xx/SPI/Makefile
+++ b/testhal/STM32L1xx/SPI/Makefile
@@ -73,7 +73,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32L_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32L1xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32L1xx/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32l1xx.mk
diff --git a/testhal/STM32L1xx/UART/Makefile b/testhal/STM32L1xx/UART/Makefile
index 0a977de72..bbbb15924 100644
--- a/testhal/STM32L1xx/UART/Makefile
+++ b/testhal/STM32L1xx/UART/Makefile
@@ -73,7 +73,7 @@ PROJECT = ch
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32L_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32L1xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32/STM32L1xx/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32l1xx.mk