From ff7f1dcd2c1bf114cbecd703d1d645c95e6f7146 Mon Sep 17 00:00:00 2001
From: Rocco Marco Guglielmi <roccomarco.guglielmi@gmail.com>
Date: Tue, 13 Mar 2018 11:33:01 +0000
Subject: [PATCH] Modified STM32-PAL demo

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11728 110e8d01-0319-4d1e-a829-52ad28d1bb01
---
 testhal/STM32/multi/PAL/.cproject             | 20 +++----
 testhal/STM32/multi/PAL/Makefile              | 58 +++++++++----------
 .../stm32f051_discovery}/chconf.h             |  0
 .../stm32f051_discovery}/halconf.h            |  0
 .../stm32f051_discovery}/mcuconf.h            |  0
 .../stm32f051_discovery}/portab.c             |  0
 .../stm32f051_discovery}/portab.h             |  0
 .../stm32f103_olimex}/chconf.h                |  0
 .../stm32f103_olimex}/halconf.h               |  0
 .../stm32f103_olimex}/mcuconf.h               |  0
 .../stm32f103_olimex}/portab.c                |  0
 .../stm32f103_olimex}/portab.h                |  0
 .../stm32f303_discovery}/chconf.h             |  0
 .../stm32f303_discovery}/halconf.h            |  0
 .../stm32f303_discovery}/mcuconf.h            |  0
 .../stm32f303_discovery}/portab.c             |  0
 .../stm32f303_discovery}/portab.h             |  0
 .../stm32f373_eval}/chconf.h                  |  0
 .../stm32f373_eval}/halconf.h                 |  0
 .../stm32f373_eval}/mcuconf.h                 |  0
 .../stm32f373_eval}/portab.c                  |  0
 .../stm32f373_eval}/portab.h                  |  0
 .../stm32f407_discovery}/chconf.h             |  0
 .../stm32f407_discovery}/halconf.h            |  0
 .../stm32f407_discovery}/mcuconf.h            |  0
 .../stm32f407_discovery}/portab.c             |  0
 .../stm32f407_discovery}/portab.h             |  0
 .../stm32f429_discovery}/chconf.h             |  0
 .../stm32f429_discovery}/halconf.h            |  0
 .../stm32f429_discovery}/mcuconf.h            |  0
 .../stm32f429_discovery}/portab.c             |  0
 .../stm32f429_discovery}/portab.h             |  0
 .../stm32f746_discovery}/chconf.h             |  0
 .../stm32f746_discovery}/halconf.h            |  0
 .../stm32f746_discovery}/mcuconf.h            |  0
 .../stm32f746_discovery}/portab.c             |  0
 .../stm32f746_discovery}/portab.h             |  0
 .../stm32l053_discovery}/chconf.h             |  0
 .../stm32l053_discovery}/halconf.h            |  0
 .../stm32l053_discovery}/mcuconf.h            |  0
 .../stm32l053_discovery}/portab.c             |  0
 .../stm32l053_discovery}/portab.h             |  0
 .../stm32l151_discovery}/chconf.h             |  0
 .../stm32l151_discovery}/halconf.h            |  0
 .../stm32l151_discovery}/mcuconf.h            |  0
 .../stm32l151_discovery}/portab.c             |  0
 .../stm32l151_discovery}/portab.h             |  0
 .../stm32l476_discovery}/chconf.h             |  0
 .../stm32l476_discovery}/halconf.h            |  2 +-
 .../stm32l476_discovery}/mcuconf.h            |  0
 .../stm32l476_discovery}/portab.c             |  2 +-
 .../stm32l476_discovery}/portab.h             |  0
 ...t ELF file)(OpenOCD, Flash and Run).launch |  2 +-
 ...Select ELF file)(OpenOCD, Just Run).launch |  2 +-
 .../stm32f051_discovery}                      |  4 +-
 .../stm32f103_olimex}                         |  4 +-
 .../stm32f303_discovery}                      |  4 +-
 .../stm32f373_eval}                           |  4 +-
 .../stm32f407_discovery}                      |  4 +-
 .../stm32f429_discovery}                      |  4 +-
 .../stm32f746_discovery}                      |  4 +-
 .../stm32l053_discovery}                      |  4 +-
 .../stm32l151_discovery}                      |  4 +-
 .../stm32l476_discovery}                      |  4 +-
 64 files changed, 62 insertions(+), 64 deletions(-)
 rename testhal/STM32/multi/PAL/{cfg-stm32f051_discovery => cfg/stm32f051_discovery}/chconf.h (100%)
 rename testhal/STM32/multi/PAL/{cfg-stm32f051_discovery => cfg/stm32f051_discovery}/halconf.h (100%)
 rename testhal/STM32/multi/PAL/{cfg-stm32f051_discovery => cfg/stm32f051_discovery}/mcuconf.h (100%)
 rename testhal/STM32/multi/PAL/{cfg-stm32f051_discovery => cfg/stm32f051_discovery}/portab.c (100%)
 rename testhal/STM32/multi/PAL/{cfg-stm32f051_discovery => cfg/stm32f051_discovery}/portab.h (100%)
 rename testhal/STM32/multi/PAL/{cfg-stm32f103_olimex => cfg/stm32f103_olimex}/chconf.h (100%)
 mode change 100755 => 100644
 rename testhal/STM32/multi/PAL/{cfg-stm32f103_olimex => cfg/stm32f103_olimex}/halconf.h (100%)
 rename testhal/STM32/multi/PAL/{cfg-stm32f103_olimex => cfg/stm32f103_olimex}/mcuconf.h (100%)
 mode change 100755 => 100644
 rename testhal/STM32/multi/PAL/{cfg-stm32f103_olimex => cfg/stm32f103_olimex}/portab.c (100%)
 rename testhal/STM32/multi/PAL/{cfg-stm32f103_olimex => cfg/stm32f103_olimex}/portab.h (100%)
 rename testhal/STM32/multi/PAL/{cfg-stm32f303_discovery => cfg/stm32f303_discovery}/chconf.h (100%)
 rename testhal/STM32/multi/PAL/{cfg-stm32f303_discovery => cfg/stm32f303_discovery}/halconf.h (100%)
 rename testhal/STM32/multi/PAL/{cfg-stm32f303_discovery => cfg/stm32f303_discovery}/mcuconf.h (100%)
 rename testhal/STM32/multi/PAL/{cfg-stm32f303_discovery => cfg/stm32f303_discovery}/portab.c (100%)
 rename testhal/STM32/multi/PAL/{cfg-stm32f303_discovery => cfg/stm32f303_discovery}/portab.h (100%)
 rename testhal/STM32/multi/PAL/{cfg-stm32f373_eval => cfg/stm32f373_eval}/chconf.h (100%)
 mode change 100755 => 100644
 rename testhal/STM32/multi/PAL/{cfg-stm32f373_eval => cfg/stm32f373_eval}/halconf.h (100%)
 rename testhal/STM32/multi/PAL/{cfg-stm32f373_eval => cfg/stm32f373_eval}/mcuconf.h (100%)
 mode change 100755 => 100644
 rename testhal/STM32/multi/PAL/{cfg-stm32f373_eval => cfg/stm32f373_eval}/portab.c (100%)
 rename testhal/STM32/multi/PAL/{cfg-stm32f373_eval => cfg/stm32f373_eval}/portab.h (100%)
 rename testhal/STM32/multi/PAL/{cfg-stm32f407_discovery => cfg/stm32f407_discovery}/chconf.h (100%)
 rename testhal/STM32/multi/PAL/{cfg-stm32f407_discovery => cfg/stm32f407_discovery}/halconf.h (100%)
 rename testhal/STM32/multi/PAL/{cfg-stm32f407_discovery => cfg/stm32f407_discovery}/mcuconf.h (100%)
 rename testhal/STM32/multi/PAL/{cfg-stm32f407_discovery => cfg/stm32f407_discovery}/portab.c (100%)
 rename testhal/STM32/multi/PAL/{cfg-stm32f407_discovery => cfg/stm32f407_discovery}/portab.h (100%)
 rename testhal/STM32/multi/PAL/{cfg-stm32f429_discovery => cfg/stm32f429_discovery}/chconf.h (100%)
 rename testhal/STM32/multi/PAL/{cfg-stm32f429_discovery => cfg/stm32f429_discovery}/halconf.h (100%)
 rename testhal/STM32/multi/PAL/{cfg-stm32f429_discovery => cfg/stm32f429_discovery}/mcuconf.h (100%)
 rename testhal/STM32/multi/PAL/{cfg-stm32f429_discovery => cfg/stm32f429_discovery}/portab.c (100%)
 rename testhal/STM32/multi/PAL/{cfg-stm32f429_discovery => cfg/stm32f429_discovery}/portab.h (100%)
 rename testhal/STM32/multi/PAL/{cfg-stm32f746_discovery => cfg/stm32f746_discovery}/chconf.h (100%)
 rename testhal/STM32/multi/PAL/{cfg-stm32f746_discovery => cfg/stm32f746_discovery}/halconf.h (100%)
 rename testhal/STM32/multi/PAL/{cfg-stm32f746_discovery => cfg/stm32f746_discovery}/mcuconf.h (100%)
 rename testhal/STM32/multi/PAL/{cfg-stm32f746_discovery => cfg/stm32f746_discovery}/portab.c (100%)
 rename testhal/STM32/multi/PAL/{cfg-stm32f746_discovery => cfg/stm32f746_discovery}/portab.h (100%)
 rename testhal/STM32/multi/PAL/{cfg-stm32l053_discovery => cfg/stm32l053_discovery}/chconf.h (100%)
 mode change 100755 => 100644
 rename testhal/STM32/multi/PAL/{cfg-stm32l053_discovery => cfg/stm32l053_discovery}/halconf.h (100%)
 rename testhal/STM32/multi/PAL/{cfg-stm32l053_discovery => cfg/stm32l053_discovery}/mcuconf.h (100%)
 rename testhal/STM32/multi/PAL/{cfg-stm32l053_discovery => cfg/stm32l053_discovery}/portab.c (100%)
 rename testhal/STM32/multi/PAL/{cfg-stm32l053_discovery => cfg/stm32l053_discovery}/portab.h (100%)
 rename testhal/STM32/multi/PAL/{cfg-stm32l151_discovery => cfg/stm32l151_discovery}/chconf.h (100%)
 mode change 100755 => 100644
 rename testhal/STM32/multi/PAL/{cfg-stm32l476_discovery => cfg/stm32l151_discovery}/halconf.h (100%)
 rename testhal/STM32/multi/PAL/{cfg-stm32l151_discovery => cfg/stm32l151_discovery}/mcuconf.h (100%)
 mode change 100755 => 100644
 rename testhal/STM32/multi/PAL/{cfg-stm32l476_discovery => cfg/stm32l151_discovery}/portab.c (100%)
 rename testhal/STM32/multi/PAL/{cfg-stm32l151_discovery => cfg/stm32l151_discovery}/portab.h (100%)
 rename testhal/STM32/multi/PAL/{cfg-stm32l476_discovery => cfg/stm32l476_discovery}/chconf.h (100%)
 rename testhal/STM32/multi/PAL/{cfg-stm32l151_discovery => cfg/stm32l476_discovery}/halconf.h (96%)
 rename testhal/STM32/multi/PAL/{cfg-stm32l476_discovery => cfg/stm32l476_discovery}/mcuconf.h (100%)
 rename testhal/STM32/multi/PAL/{cfg-stm32l151_discovery => cfg/stm32l476_discovery}/portab.c (95%)
 rename testhal/STM32/multi/PAL/{cfg-stm32l476_discovery => cfg/stm32l476_discovery}/portab.h (100%)
 rename testhal/STM32/multi/PAL/{Makefile-stm32f051_discovery => make/stm32f051_discovery} (95%)
 rename testhal/STM32/multi/PAL/{Makefile-stm32f103_olimex => make/stm32f103_olimex} (95%)
 mode change 100755 => 100644
 rename testhal/STM32/multi/PAL/{Makefile-stm32f303_discovery => make/stm32f303_discovery} (95%)
 rename testhal/STM32/multi/PAL/{Makefile-stm32f373_eval => make/stm32f373_eval} (95%)
 mode change 100755 => 100644
 rename testhal/STM32/multi/PAL/{Makefile-stm32f407_discovery => make/stm32f407_discovery} (95%)
 rename testhal/STM32/multi/PAL/{Makefile-stm32f429_discovery => make/stm32f429_discovery} (95%)
 mode change 100755 => 100644
 rename testhal/STM32/multi/PAL/{Makefile-stm32f746_discovery => make/stm32f746_discovery} (95%)
 mode change 100755 => 100644
 rename testhal/STM32/multi/PAL/{Makefile-stm32l053_discovery => make/stm32l053_discovery} (95%)
 rename testhal/STM32/multi/PAL/{Makefile-stm32l151_discovery => make/stm32l151_discovery} (95%)
 mode change 100755 => 100644
 rename testhal/STM32/multi/PAL/{Makefile-stm32l476_discovery => make/stm32l476_discovery} (95%)

diff --git a/testhal/STM32/multi/PAL/.cproject b/testhal/STM32/multi/PAL/.cproject
index 6a45ccde2..7ecf202c3 100644
--- a/testhal/STM32/multi/PAL/.cproject
+++ b/testhal/STM32/multi/PAL/.cproject
@@ -52,7 +52,7 @@
 					<folderInfo id="0.1093754934.1746620542." name="/" resourcePath="">
 						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1380490469" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
 							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.1380490469.848060744" name=""/>
-							<builder arguments="-f Makefile-stm32l476_discovery" command="make" id="org.eclipse.cdt.build.core.settings.default.builder.65281971" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="unlimited" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
+							<builder arguments="-f make/stm32l476_discovery" command="make" id="org.eclipse.cdt.build.core.settings.default.builder.65281971" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="unlimited" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.2084462964" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.2129999941" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
 								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1784151092" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
@@ -86,7 +86,7 @@
 					<folderInfo id="0.1093754934.532782958." name="/" resourcePath="">
 						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.533442111" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
 							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.533442111.1390225420" name=""/>
-							<builder arguments="-f Makefile-stm32f051_discovery" command="make" id="org.eclipse.cdt.build.core.settings.default.builder.864530239" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="unlimited" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
+							<builder arguments="-f make/stm32f303_discovery" command="make" id="org.eclipse.cdt.build.core.settings.default.builder.864530239" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="unlimited" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.116689755" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.679950307" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
 								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.994473297" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
@@ -120,7 +120,7 @@
 					<folderInfo id="0.1093754934.1834762588." name="/" resourcePath="">
 						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1623555534" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
 							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.1623555534.771003082" name=""/>
-							<builder arguments="-f Makefile-stm32f407_discovery" command="make" id="org.eclipse.cdt.build.core.settings.default.builder.1947457853" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="unlimited" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
+							<builder arguments="-f make/stm32f407_discovery" command="make" id="org.eclipse.cdt.build.core.settings.default.builder.1947457853" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="unlimited" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.427593883" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.942176940" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
 								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.740420435" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
@@ -154,7 +154,7 @@
 					<folderInfo id="0.1093754934.532782958.134374917." name="/" resourcePath="">
 						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.104587822" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
 							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.104587822.156318938" name=""/>
-							<builder arguments="-f Makefile-stm32f051_discovery" command="make" id="org.eclipse.cdt.build.core.settings.default.builder.2063151368" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="unlimited" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
+							<builder arguments="-f make/stm32f051_discovery" command="make" id="org.eclipse.cdt.build.core.settings.default.builder.2063151368" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="unlimited" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1715906686" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.516622197" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
 								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1532859236" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
@@ -188,7 +188,7 @@
 					<folderInfo id="0.1093754934.1317617301." name="/" resourcePath="">
 						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.600521155" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
 							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.600521155.1940399580" name=""/>
-							<builder arguments="-f Makefile-stm32f373_eval" command="make" id="org.eclipse.cdt.build.core.settings.default.builder.1798902617" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="unlimited" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
+							<builder arguments="-f make/stm32f373_eval" command="make" id="org.eclipse.cdt.build.core.settings.default.builder.1798902617" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="unlimited" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.330286459" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.163152283" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
 								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1874280547" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
@@ -222,7 +222,7 @@
 					<folderInfo id="0.1093754934.69471493." name="/" resourcePath="">
 						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1808398336" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
 							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.1808398336.117017472" name=""/>
-							<builder arguments="-f Makefile-stm32f746_discovery" command="make" id="org.eclipse.cdt.build.core.settings.default.builder.55361525" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="unlimited" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
+							<builder arguments="-f make/stm32f746_discovery" command="make" id="org.eclipse.cdt.build.core.settings.default.builder.55361525" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="unlimited" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1622934335" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.398933181" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
 								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.334073402" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
@@ -256,7 +256,7 @@
 					<folderInfo id="0.1093754934.1927962071." name="/" resourcePath="">
 						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.77444747" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
 							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.77444747.1353224323" name=""/>
-							<builder arguments="-f Makefile-stm32l053_discovery" command="make" id="org.eclipse.cdt.build.core.settings.default.builder.1756182361" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="unlimited" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
+							<builder arguments="-f make/stm32l053_discovery" command="make" id="org.eclipse.cdt.build.core.settings.default.builder.1756182361" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="unlimited" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1138801699" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.45913031" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
 								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.737241280" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
@@ -290,7 +290,7 @@
 					<folderInfo id="0.1093754934.237698851." name="/" resourcePath="">
 						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1329233445" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
 							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.1329233445.1109621223" name=""/>
-							<builder arguments="-f Makefile-stm32l151_discovery" command="make" id="org.eclipse.cdt.build.core.settings.default.builder.670333833" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="unlimited" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
+							<builder arguments="-f make/stm32l151_discovery" command="make" id="org.eclipse.cdt.build.core.settings.default.builder.670333833" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="unlimited" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.382262143" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.374849107" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
 								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.2007154752" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
@@ -324,7 +324,7 @@
 					<folderInfo id="0.1093754934.1666172521." name="/" resourcePath="">
 						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1477908917" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
 							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.1477908917.1127610129" name=""/>
-							<builder arguments="-f Makefile-stm32f103_olimex" command="make" id="org.eclipse.cdt.build.core.settings.default.builder.2049994093" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="unlimited" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
+							<builder arguments="-f make/stm32f103_olimex" command="make" id="org.eclipse.cdt.build.core.settings.default.builder.2049994093" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="unlimited" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.977599107" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.2122315570" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
 								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1289315841" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
@@ -358,7 +358,7 @@
 					<folderInfo id="0.1093754934.366574680." name="/" resourcePath="">
 						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1562927958" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
 							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.1562927958.1915246864" name=""/>
-							<builder arguments="-f Makefile-stm32f429_discovery" command="make" id="org.eclipse.cdt.build.core.settings.default.builder.314142481" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="unlimited" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
+							<builder arguments="-f make/stm32f429_discovery" command="make" id="org.eclipse.cdt.build.core.settings.default.builder.314142481" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="unlimited" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1495591965" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.1254094356" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
 								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1502836435" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
diff --git a/testhal/STM32/multi/PAL/Makefile b/testhal/STM32/multi/PAL/Makefile
index c1d5dfdd7..47dca9f91 100644
--- a/testhal/STM32/multi/PAL/Makefile
+++ b/testhal/STM32/multi/PAL/Makefile
@@ -3,69 +3,67 @@
 #
 
 all:
-	@echo
-	@echo === Building for STM32L053-Discovery ===============================
-	@make --no-print-directory -f Makefile-stm32l053_discovery all
-	@echo ====================================================================
-	@echo
-	@echo === Building for STM32L151-Discovery ===============================
-	@make --no-print-directory -f Makefile-stm32l151_discovery all
-	@echo ====================================================================
-	@echo
-	@echo === Building for STM32L476-Discovery ===============================
-	@make --no-print-directory -f Makefile-stm32l476_discovery all
-	@echo ====================================================================
 	@echo
 	@echo === Building for STM32F051-Discovery ===============================
-	@make --no-print-directory -f Makefile-stm32f051_discovery all
+	@make --no-print-directory -f ./make/stm32f051_discovery all
 	@echo ====================================================================
 	@echo
 	@echo === Building for STM32F103-Olimex ==================================
-	@make --no-print-directory -f Makefile-stm32f103_olimex all
+	@make --no-print-directory -f ./make/stm32f103_olimex all
 	@echo ====================================================================
 	@echo
 	@echo === Building for STM32F303-Discovery ===============================
-	@make --no-print-directory -f Makefile-stm32f303_discovery all
+	@make --no-print-directory -f ./make/stm32f303_discovery all
 	@echo ====================================================================
 	@echo
 	@echo === Building for STM32F373-Eval ====================================
-	@make --no-print-directory -f Makefile-stm32f373_eval all
+	@make --no-print-directory -f ./make/stm32f373_eval all
 	@echo ====================================================================
 	@echo
 	@echo === Building for STM32F407-Discovery ===============================
-	@make --no-print-directory -f Makefile-stm32f407_discovery all
+	@make --no-print-directory -f ./make/stm32f407_discovery all
 	@echo ====================================================================
 	@echo
 	@echo === Building for STM32F429-Discovery ===============================
-	@make --no-print-directory -f Makefile-stm32f429_discovery all
+	@make --no-print-directory -f ./make/stm32f429_discovery all
 	@echo ====================================================================
 	@echo
 	@echo === Building for STM32F746-Discovery ===============================
-	@make --no-print-directory -f Makefile-stm32f746_discovery all
+	@make --no-print-directory -f ./make/stm32f746_discovery all
 	@echo ====================================================================
 	@echo
-
+	@echo === Building for STM32L053-Discovery ===============================
+	@make --no-print-directory -f ./make/stm32l053_discovery all
+	@echo ====================================================================
+	@echo
+	@echo === Building for STM32L151-Discovery ===============================
+	@make --no-print-directory -f ./make/stm32l151_discovery all
+	@echo ====================================================================
+	@echo
+	@echo === Building for STM32L476-Discovery ===============================
+	@make --no-print-directory -f ./make/stm32l476_discovery all
+	@echo ====================================================================
 clean:
 	@echo
-	-@make --no-print-directory -f Makefile-stm32l053_discovery clean
+	-@make --no-print-directory -f ./make/stm32f051_discovery clean
 	@echo
-	-@make --no-print-directory -f Makefile-stm32l151_discovery clean
+	-@make --no-print-directory -f ./make/stm32f103_olimex clean
 	@echo
-	-@make --no-print-directory -f Makefile-stm32l476_discovery clean
+	-@make --no-print-directory -f ./make/stm32f303_discovery clean
 	@echo
-	-@make --no-print-directory -f Makefile-stm32f051_discovery clean
+	-@make --no-print-directory -f ./make/stm32f373_eval clean
 	@echo
-	-@make --no-print-directory -f Makefile-stm32f103_olimex clean
+	-@make --no-print-directory -f ./make/stm32f407_discovery clean
 	@echo
-	-@make --no-print-directory -f Makefile-stm32f303_discovery clean
+	-@make --no-print-directory -f ./make/stm32f429_discovery clean
 	@echo
-	-@make --no-print-directory -f Makefile-stm32f373_eval clean
+	-@make --no-print-directory -f ./make/stm32f746_discovery clean
 	@echo
-	-@make --no-print-directory -f Makefile-stm32f407_discovery clean
+	-@make --no-print-directory -f ./make/stm32l053_discovery clean
 	@echo
-	-@make --no-print-directory -f Makefile-stm32f429_discovery clean
+	-@make --no-print-directory -f ./make/stm32l151_discovery clean
 	@echo
-	-@make --no-print-directory -f Makefile-stm32f746_discovery clean
+	-@make --no-print-directory -f ./make/stm32l476_discovery clean
 	@echo
 
 #
diff --git a/testhal/STM32/multi/PAL/cfg-stm32f051_discovery/chconf.h b/testhal/STM32/multi/PAL/cfg/stm32f051_discovery/chconf.h
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32f051_discovery/chconf.h
rename to testhal/STM32/multi/PAL/cfg/stm32f051_discovery/chconf.h
diff --git a/testhal/STM32/multi/PAL/cfg-stm32f051_discovery/halconf.h b/testhal/STM32/multi/PAL/cfg/stm32f051_discovery/halconf.h
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32f051_discovery/halconf.h
rename to testhal/STM32/multi/PAL/cfg/stm32f051_discovery/halconf.h
diff --git a/testhal/STM32/multi/PAL/cfg-stm32f051_discovery/mcuconf.h b/testhal/STM32/multi/PAL/cfg/stm32f051_discovery/mcuconf.h
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32f051_discovery/mcuconf.h
rename to testhal/STM32/multi/PAL/cfg/stm32f051_discovery/mcuconf.h
diff --git a/testhal/STM32/multi/PAL/cfg-stm32f051_discovery/portab.c b/testhal/STM32/multi/PAL/cfg/stm32f051_discovery/portab.c
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32f051_discovery/portab.c
rename to testhal/STM32/multi/PAL/cfg/stm32f051_discovery/portab.c
diff --git a/testhal/STM32/multi/PAL/cfg-stm32f051_discovery/portab.h b/testhal/STM32/multi/PAL/cfg/stm32f051_discovery/portab.h
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32f051_discovery/portab.h
rename to testhal/STM32/multi/PAL/cfg/stm32f051_discovery/portab.h
diff --git a/testhal/STM32/multi/PAL/cfg-stm32f103_olimex/chconf.h b/testhal/STM32/multi/PAL/cfg/stm32f103_olimex/chconf.h
old mode 100755
new mode 100644
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32f103_olimex/chconf.h
rename to testhal/STM32/multi/PAL/cfg/stm32f103_olimex/chconf.h
diff --git a/testhal/STM32/multi/PAL/cfg-stm32f103_olimex/halconf.h b/testhal/STM32/multi/PAL/cfg/stm32f103_olimex/halconf.h
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32f103_olimex/halconf.h
rename to testhal/STM32/multi/PAL/cfg/stm32f103_olimex/halconf.h
diff --git a/testhal/STM32/multi/PAL/cfg-stm32f103_olimex/mcuconf.h b/testhal/STM32/multi/PAL/cfg/stm32f103_olimex/mcuconf.h
old mode 100755
new mode 100644
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32f103_olimex/mcuconf.h
rename to testhal/STM32/multi/PAL/cfg/stm32f103_olimex/mcuconf.h
diff --git a/testhal/STM32/multi/PAL/cfg-stm32f103_olimex/portab.c b/testhal/STM32/multi/PAL/cfg/stm32f103_olimex/portab.c
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32f103_olimex/portab.c
rename to testhal/STM32/multi/PAL/cfg/stm32f103_olimex/portab.c
diff --git a/testhal/STM32/multi/PAL/cfg-stm32f103_olimex/portab.h b/testhal/STM32/multi/PAL/cfg/stm32f103_olimex/portab.h
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32f103_olimex/portab.h
rename to testhal/STM32/multi/PAL/cfg/stm32f103_olimex/portab.h
diff --git a/testhal/STM32/multi/PAL/cfg-stm32f303_discovery/chconf.h b/testhal/STM32/multi/PAL/cfg/stm32f303_discovery/chconf.h
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32f303_discovery/chconf.h
rename to testhal/STM32/multi/PAL/cfg/stm32f303_discovery/chconf.h
diff --git a/testhal/STM32/multi/PAL/cfg-stm32f303_discovery/halconf.h b/testhal/STM32/multi/PAL/cfg/stm32f303_discovery/halconf.h
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32f303_discovery/halconf.h
rename to testhal/STM32/multi/PAL/cfg/stm32f303_discovery/halconf.h
diff --git a/testhal/STM32/multi/PAL/cfg-stm32f303_discovery/mcuconf.h b/testhal/STM32/multi/PAL/cfg/stm32f303_discovery/mcuconf.h
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32f303_discovery/mcuconf.h
rename to testhal/STM32/multi/PAL/cfg/stm32f303_discovery/mcuconf.h
diff --git a/testhal/STM32/multi/PAL/cfg-stm32f303_discovery/portab.c b/testhal/STM32/multi/PAL/cfg/stm32f303_discovery/portab.c
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32f303_discovery/portab.c
rename to testhal/STM32/multi/PAL/cfg/stm32f303_discovery/portab.c
diff --git a/testhal/STM32/multi/PAL/cfg-stm32f303_discovery/portab.h b/testhal/STM32/multi/PAL/cfg/stm32f303_discovery/portab.h
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32f303_discovery/portab.h
rename to testhal/STM32/multi/PAL/cfg/stm32f303_discovery/portab.h
diff --git a/testhal/STM32/multi/PAL/cfg-stm32f373_eval/chconf.h b/testhal/STM32/multi/PAL/cfg/stm32f373_eval/chconf.h
old mode 100755
new mode 100644
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32f373_eval/chconf.h
rename to testhal/STM32/multi/PAL/cfg/stm32f373_eval/chconf.h
diff --git a/testhal/STM32/multi/PAL/cfg-stm32f373_eval/halconf.h b/testhal/STM32/multi/PAL/cfg/stm32f373_eval/halconf.h
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32f373_eval/halconf.h
rename to testhal/STM32/multi/PAL/cfg/stm32f373_eval/halconf.h
diff --git a/testhal/STM32/multi/PAL/cfg-stm32f373_eval/mcuconf.h b/testhal/STM32/multi/PAL/cfg/stm32f373_eval/mcuconf.h
old mode 100755
new mode 100644
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32f373_eval/mcuconf.h
rename to testhal/STM32/multi/PAL/cfg/stm32f373_eval/mcuconf.h
diff --git a/testhal/STM32/multi/PAL/cfg-stm32f373_eval/portab.c b/testhal/STM32/multi/PAL/cfg/stm32f373_eval/portab.c
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32f373_eval/portab.c
rename to testhal/STM32/multi/PAL/cfg/stm32f373_eval/portab.c
diff --git a/testhal/STM32/multi/PAL/cfg-stm32f373_eval/portab.h b/testhal/STM32/multi/PAL/cfg/stm32f373_eval/portab.h
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32f373_eval/portab.h
rename to testhal/STM32/multi/PAL/cfg/stm32f373_eval/portab.h
diff --git a/testhal/STM32/multi/PAL/cfg-stm32f407_discovery/chconf.h b/testhal/STM32/multi/PAL/cfg/stm32f407_discovery/chconf.h
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32f407_discovery/chconf.h
rename to testhal/STM32/multi/PAL/cfg/stm32f407_discovery/chconf.h
diff --git a/testhal/STM32/multi/PAL/cfg-stm32f407_discovery/halconf.h b/testhal/STM32/multi/PAL/cfg/stm32f407_discovery/halconf.h
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32f407_discovery/halconf.h
rename to testhal/STM32/multi/PAL/cfg/stm32f407_discovery/halconf.h
diff --git a/testhal/STM32/multi/PAL/cfg-stm32f407_discovery/mcuconf.h b/testhal/STM32/multi/PAL/cfg/stm32f407_discovery/mcuconf.h
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32f407_discovery/mcuconf.h
rename to testhal/STM32/multi/PAL/cfg/stm32f407_discovery/mcuconf.h
diff --git a/testhal/STM32/multi/PAL/cfg-stm32f407_discovery/portab.c b/testhal/STM32/multi/PAL/cfg/stm32f407_discovery/portab.c
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32f407_discovery/portab.c
rename to testhal/STM32/multi/PAL/cfg/stm32f407_discovery/portab.c
diff --git a/testhal/STM32/multi/PAL/cfg-stm32f407_discovery/portab.h b/testhal/STM32/multi/PAL/cfg/stm32f407_discovery/portab.h
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32f407_discovery/portab.h
rename to testhal/STM32/multi/PAL/cfg/stm32f407_discovery/portab.h
diff --git a/testhal/STM32/multi/PAL/cfg-stm32f429_discovery/chconf.h b/testhal/STM32/multi/PAL/cfg/stm32f429_discovery/chconf.h
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32f429_discovery/chconf.h
rename to testhal/STM32/multi/PAL/cfg/stm32f429_discovery/chconf.h
diff --git a/testhal/STM32/multi/PAL/cfg-stm32f429_discovery/halconf.h b/testhal/STM32/multi/PAL/cfg/stm32f429_discovery/halconf.h
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32f429_discovery/halconf.h
rename to testhal/STM32/multi/PAL/cfg/stm32f429_discovery/halconf.h
diff --git a/testhal/STM32/multi/PAL/cfg-stm32f429_discovery/mcuconf.h b/testhal/STM32/multi/PAL/cfg/stm32f429_discovery/mcuconf.h
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32f429_discovery/mcuconf.h
rename to testhal/STM32/multi/PAL/cfg/stm32f429_discovery/mcuconf.h
diff --git a/testhal/STM32/multi/PAL/cfg-stm32f429_discovery/portab.c b/testhal/STM32/multi/PAL/cfg/stm32f429_discovery/portab.c
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32f429_discovery/portab.c
rename to testhal/STM32/multi/PAL/cfg/stm32f429_discovery/portab.c
diff --git a/testhal/STM32/multi/PAL/cfg-stm32f429_discovery/portab.h b/testhal/STM32/multi/PAL/cfg/stm32f429_discovery/portab.h
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32f429_discovery/portab.h
rename to testhal/STM32/multi/PAL/cfg/stm32f429_discovery/portab.h
diff --git a/testhal/STM32/multi/PAL/cfg-stm32f746_discovery/chconf.h b/testhal/STM32/multi/PAL/cfg/stm32f746_discovery/chconf.h
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32f746_discovery/chconf.h
rename to testhal/STM32/multi/PAL/cfg/stm32f746_discovery/chconf.h
diff --git a/testhal/STM32/multi/PAL/cfg-stm32f746_discovery/halconf.h b/testhal/STM32/multi/PAL/cfg/stm32f746_discovery/halconf.h
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32f746_discovery/halconf.h
rename to testhal/STM32/multi/PAL/cfg/stm32f746_discovery/halconf.h
diff --git a/testhal/STM32/multi/PAL/cfg-stm32f746_discovery/mcuconf.h b/testhal/STM32/multi/PAL/cfg/stm32f746_discovery/mcuconf.h
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32f746_discovery/mcuconf.h
rename to testhal/STM32/multi/PAL/cfg/stm32f746_discovery/mcuconf.h
diff --git a/testhal/STM32/multi/PAL/cfg-stm32f746_discovery/portab.c b/testhal/STM32/multi/PAL/cfg/stm32f746_discovery/portab.c
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32f746_discovery/portab.c
rename to testhal/STM32/multi/PAL/cfg/stm32f746_discovery/portab.c
diff --git a/testhal/STM32/multi/PAL/cfg-stm32f746_discovery/portab.h b/testhal/STM32/multi/PAL/cfg/stm32f746_discovery/portab.h
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32f746_discovery/portab.h
rename to testhal/STM32/multi/PAL/cfg/stm32f746_discovery/portab.h
diff --git a/testhal/STM32/multi/PAL/cfg-stm32l053_discovery/chconf.h b/testhal/STM32/multi/PAL/cfg/stm32l053_discovery/chconf.h
old mode 100755
new mode 100644
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32l053_discovery/chconf.h
rename to testhal/STM32/multi/PAL/cfg/stm32l053_discovery/chconf.h
diff --git a/testhal/STM32/multi/PAL/cfg-stm32l053_discovery/halconf.h b/testhal/STM32/multi/PAL/cfg/stm32l053_discovery/halconf.h
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32l053_discovery/halconf.h
rename to testhal/STM32/multi/PAL/cfg/stm32l053_discovery/halconf.h
diff --git a/testhal/STM32/multi/PAL/cfg-stm32l053_discovery/mcuconf.h b/testhal/STM32/multi/PAL/cfg/stm32l053_discovery/mcuconf.h
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32l053_discovery/mcuconf.h
rename to testhal/STM32/multi/PAL/cfg/stm32l053_discovery/mcuconf.h
diff --git a/testhal/STM32/multi/PAL/cfg-stm32l053_discovery/portab.c b/testhal/STM32/multi/PAL/cfg/stm32l053_discovery/portab.c
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32l053_discovery/portab.c
rename to testhal/STM32/multi/PAL/cfg/stm32l053_discovery/portab.c
diff --git a/testhal/STM32/multi/PAL/cfg-stm32l053_discovery/portab.h b/testhal/STM32/multi/PAL/cfg/stm32l053_discovery/portab.h
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32l053_discovery/portab.h
rename to testhal/STM32/multi/PAL/cfg/stm32l053_discovery/portab.h
diff --git a/testhal/STM32/multi/PAL/cfg-stm32l151_discovery/chconf.h b/testhal/STM32/multi/PAL/cfg/stm32l151_discovery/chconf.h
old mode 100755
new mode 100644
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32l151_discovery/chconf.h
rename to testhal/STM32/multi/PAL/cfg/stm32l151_discovery/chconf.h
diff --git a/testhal/STM32/multi/PAL/cfg-stm32l476_discovery/halconf.h b/testhal/STM32/multi/PAL/cfg/stm32l151_discovery/halconf.h
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32l476_discovery/halconf.h
rename to testhal/STM32/multi/PAL/cfg/stm32l151_discovery/halconf.h
diff --git a/testhal/STM32/multi/PAL/cfg-stm32l151_discovery/mcuconf.h b/testhal/STM32/multi/PAL/cfg/stm32l151_discovery/mcuconf.h
old mode 100755
new mode 100644
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32l151_discovery/mcuconf.h
rename to testhal/STM32/multi/PAL/cfg/stm32l151_discovery/mcuconf.h
diff --git a/testhal/STM32/multi/PAL/cfg-stm32l476_discovery/portab.c b/testhal/STM32/multi/PAL/cfg/stm32l151_discovery/portab.c
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32l476_discovery/portab.c
rename to testhal/STM32/multi/PAL/cfg/stm32l151_discovery/portab.c
diff --git a/testhal/STM32/multi/PAL/cfg-stm32l151_discovery/portab.h b/testhal/STM32/multi/PAL/cfg/stm32l151_discovery/portab.h
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32l151_discovery/portab.h
rename to testhal/STM32/multi/PAL/cfg/stm32l151_discovery/portab.h
diff --git a/testhal/STM32/multi/PAL/cfg-stm32l476_discovery/chconf.h b/testhal/STM32/multi/PAL/cfg/stm32l476_discovery/chconf.h
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32l476_discovery/chconf.h
rename to testhal/STM32/multi/PAL/cfg/stm32l476_discovery/chconf.h
diff --git a/testhal/STM32/multi/PAL/cfg-stm32l151_discovery/halconf.h b/testhal/STM32/multi/PAL/cfg/stm32l476_discovery/halconf.h
similarity index 96%
rename from testhal/STM32/multi/PAL/cfg-stm32l151_discovery/halconf.h
rename to testhal/STM32/multi/PAL/cfg/stm32l476_discovery/halconf.h
index cfb4d401a..6d3895392 100644
--- a/testhal/STM32/multi/PAL/cfg-stm32l151_discovery/halconf.h
+++ b/testhal/STM32/multi/PAL/cfg/stm32l476_discovery/halconf.h
@@ -28,7 +28,7 @@
 #ifndef HALCONF_H
 #define HALCONF_H
 
-#include <cfg-stm32l151_discovery/mcuconf.h>
+#include "mcuconf.h"
 
 /**
  * @brief   Enables the PAL subsystem.
diff --git a/testhal/STM32/multi/PAL/cfg-stm32l476_discovery/mcuconf.h b/testhal/STM32/multi/PAL/cfg/stm32l476_discovery/mcuconf.h
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32l476_discovery/mcuconf.h
rename to testhal/STM32/multi/PAL/cfg/stm32l476_discovery/mcuconf.h
diff --git a/testhal/STM32/multi/PAL/cfg-stm32l151_discovery/portab.c b/testhal/STM32/multi/PAL/cfg/stm32l476_discovery/portab.c
similarity index 95%
rename from testhal/STM32/multi/PAL/cfg-stm32l151_discovery/portab.c
rename to testhal/STM32/multi/PAL/cfg/stm32l476_discovery/portab.c
index e05972153..6315515a0 100644
--- a/testhal/STM32/multi/PAL/cfg-stm32l151_discovery/portab.c
+++ b/testhal/STM32/multi/PAL/cfg/stm32l476_discovery/portab.c
@@ -22,7 +22,7 @@
  * @{
  */
 
-#include <cfg-stm32l151_discovery/portab.h>
+#include "portab.h"
 
 /*===========================================================================*/
 /* Module local definitions.                                                 */
diff --git a/testhal/STM32/multi/PAL/cfg-stm32l476_discovery/portab.h b/testhal/STM32/multi/PAL/cfg/stm32l476_discovery/portab.h
similarity index 100%
rename from testhal/STM32/multi/PAL/cfg-stm32l476_discovery/portab.h
rename to testhal/STM32/multi/PAL/cfg/stm32l476_discovery/portab.h
diff --git a/testhal/STM32/multi/PAL/debug/STM32-PAL (Select ELF file)(OpenOCD, Flash and Run).launch b/testhal/STM32/multi/PAL/debug/STM32-PAL (Select ELF file)(OpenOCD, Flash and Run).launch
index 1e7f3f6e9..a5feeb04d 100644
--- a/testhal/STM32/multi/PAL/debug/STM32-PAL (Select ELF file)(OpenOCD, Flash and Run).launch	
+++ b/testhal/STM32/multi/PAL/debug/STM32-PAL (Select ELF file)(OpenOCD, Flash and Run).launch	
@@ -36,7 +36,7 @@
 <stringAttribute key="org.eclipse.cdt.launch.FORMAT" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&lt;contentList&gt;&lt;content id=&quot;xPSR-(format)&quot; val=&quot;4&quot;/&gt;&lt;/contentList&gt;"/>
 <stringAttribute key="org.eclipse.cdt.launch.GLOBAL_VARIABLES" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;globalVariableList/&gt;&#13;&#10;"/>
 <stringAttribute key="org.eclipse.cdt.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;memoryBlockExpressionList&gt;&#13;&#10;&lt;memoryBlockExpressionItem&gt;&#13;&#10;&lt;expression text=&quot;0x40021004&quot;/&gt;&#13;&#10;&lt;/memoryBlockExpressionItem&gt;&#13;&#10;&lt;/memoryBlockExpressionList&gt;&#13;&#10;"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="${selected_resource_loc}"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="${selected_resource_loc}/ch.elf"/>
 <stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="STM32-PAL"/>
 <booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value=""/>
diff --git a/testhal/STM32/multi/PAL/debug/STM32-PAL (Select ELF file)(OpenOCD, Just Run).launch b/testhal/STM32/multi/PAL/debug/STM32-PAL (Select ELF file)(OpenOCD, Just Run).launch
index 4aa924aeb..66eadb429 100644
--- a/testhal/STM32/multi/PAL/debug/STM32-PAL (Select ELF file)(OpenOCD, Just Run).launch	
+++ b/testhal/STM32/multi/PAL/debug/STM32-PAL (Select ELF file)(OpenOCD, Just Run).launch	
@@ -36,7 +36,7 @@
 <stringAttribute key="org.eclipse.cdt.launch.FORMAT" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&lt;contentList&gt;&lt;content id=&quot;xPSR-(format)&quot; val=&quot;4&quot;/&gt;&lt;/contentList&gt;"/>
 <stringAttribute key="org.eclipse.cdt.launch.GLOBAL_VARIABLES" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;globalVariableList/&gt;&#13;&#10;"/>
 <stringAttribute key="org.eclipse.cdt.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;memoryBlockExpressionList&gt;&#13;&#10;&lt;memoryBlockExpressionItem&gt;&#13;&#10;&lt;expression text=&quot;0x40021004&quot;/&gt;&#13;&#10;&lt;/memoryBlockExpressionItem&gt;&#13;&#10;&lt;/memoryBlockExpressionList&gt;&#13;&#10;"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="${selected_resource_loc}"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="${selected_resource_loc}/ch.elf"/>
 <stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="STM32-PAL"/>
 <booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value=""/>
diff --git a/testhal/STM32/multi/PAL/Makefile-stm32f051_discovery b/testhal/STM32/multi/PAL/make/stm32f051_discovery
similarity index 95%
rename from testhal/STM32/multi/PAL/Makefile-stm32f051_discovery
rename to testhal/STM32/multi/PAL/make/stm32f051_discovery
index 7899079c2..c86e143bd 100644
--- a/testhal/STM32/multi/PAL/Makefile-stm32f051_discovery
+++ b/testhal/STM32/multi/PAL/make/stm32f051_discovery
@@ -82,8 +82,8 @@ PROJECT = ch
 
 # Imported source files and paths
 CHIBIOS  := ../../../..
-CONFDIR  := ./cfg-stm32f051_discovery
-BUILDDIR := ./build-stm32f051_discovery
+CONFDIR  := ./cfg/stm32f051_discovery
+BUILDDIR := ./build/stm32f051_discovery
 DEPDIR   := ./.dep-stm32f051_discovery
 
 # Licensing files.
diff --git a/testhal/STM32/multi/PAL/Makefile-stm32f103_olimex b/testhal/STM32/multi/PAL/make/stm32f103_olimex
old mode 100755
new mode 100644
similarity index 95%
rename from testhal/STM32/multi/PAL/Makefile-stm32f103_olimex
rename to testhal/STM32/multi/PAL/make/stm32f103_olimex
index 50d81d811..eaad9bd1c
--- a/testhal/STM32/multi/PAL/Makefile-stm32f103_olimex
+++ b/testhal/STM32/multi/PAL/make/stm32f103_olimex
@@ -82,8 +82,8 @@ PROJECT = ch
 
 # Imported source files and paths
 CHIBIOS  := ../../../..
-CONFDIR  := ./cfg-stm32f103_olimex
-BUILDDIR := ./build-stm32f103_olimex
+CONFDIR  := ./cfg/stm32f103_olimex
+BUILDDIR := ./build/stm32f103_olimex
 DEPDIR   := ./.dep-stm32f103_olimex
 
 # Licensing files.
diff --git a/testhal/STM32/multi/PAL/Makefile-stm32f303_discovery b/testhal/STM32/multi/PAL/make/stm32f303_discovery
similarity index 95%
rename from testhal/STM32/multi/PAL/Makefile-stm32f303_discovery
rename to testhal/STM32/multi/PAL/make/stm32f303_discovery
index 7b466e511..22fcee6f5 100644
--- a/testhal/STM32/multi/PAL/Makefile-stm32f303_discovery
+++ b/testhal/STM32/multi/PAL/make/stm32f303_discovery
@@ -92,8 +92,8 @@ PROJECT = ch
 
 # Imported source files and paths
 CHIBIOS  := ../../../..
-CONFDIR  := ./cfg-stm32f303_discovery
-BUILDDIR := ./build-stm32f303_discovery
+CONFDIR  := ./cfg/stm32f303_discovery
+BUILDDIR := ./build/stm32f303_discovery
 DEPDIR   := ./.dep-stm32f303_discovery
 
 # Licensing files.
diff --git a/testhal/STM32/multi/PAL/Makefile-stm32f373_eval b/testhal/STM32/multi/PAL/make/stm32f373_eval
old mode 100755
new mode 100644
similarity index 95%
rename from testhal/STM32/multi/PAL/Makefile-stm32f373_eval
rename to testhal/STM32/multi/PAL/make/stm32f373_eval
index 9dc12d850..a642b56ca
--- a/testhal/STM32/multi/PAL/Makefile-stm32f373_eval
+++ b/testhal/STM32/multi/PAL/make/stm32f373_eval
@@ -92,8 +92,8 @@ PROJECT = ch
 
 # Imported source files and paths
 CHIBIOS  := ../../../..
-CONFDIR  := ./cfg-stm32f373_eval
-BUILDDIR := ./build-stm32f373_eval
+CONFDIR  := ./cfg/stm32f373_eval
+BUILDDIR := ./build/stm32f373_eval
 DEPDIR   := ./.dep-stm32f373_eval
 
 # Licensing files.
diff --git a/testhal/STM32/multi/PAL/Makefile-stm32f407_discovery b/testhal/STM32/multi/PAL/make/stm32f407_discovery
similarity index 95%
rename from testhal/STM32/multi/PAL/Makefile-stm32f407_discovery
rename to testhal/STM32/multi/PAL/make/stm32f407_discovery
index d2e340029..0e5c8c745 100644
--- a/testhal/STM32/multi/PAL/Makefile-stm32f407_discovery
+++ b/testhal/STM32/multi/PAL/make/stm32f407_discovery
@@ -92,8 +92,8 @@ PROJECT = ch
 
 # Imported source files and paths
 CHIBIOS  := ../../../..
-CONFDIR  := ./cfg-stm32f407_discovery
-BUILDDIR := ./build-stm32f407_discovery
+CONFDIR  := ./cfg/stm32f407_discovery
+BUILDDIR := ./build/stm32f407_discovery
 DEPDIR   := ./.dep-stm32f407_discovery
 
 # Licensing files.
diff --git a/testhal/STM32/multi/PAL/Makefile-stm32f429_discovery b/testhal/STM32/multi/PAL/make/stm32f429_discovery
old mode 100755
new mode 100644
similarity index 95%
rename from testhal/STM32/multi/PAL/Makefile-stm32f429_discovery
rename to testhal/STM32/multi/PAL/make/stm32f429_discovery
index f596a5929..850334e93
--- a/testhal/STM32/multi/PAL/Makefile-stm32f429_discovery
+++ b/testhal/STM32/multi/PAL/make/stm32f429_discovery
@@ -92,8 +92,8 @@ PROJECT = ch
 
 # Imported source files and paths
 CHIBIOS  := ../../../..
-CONFDIR  := ./cfg-stm32f429_discovery
-BUILDDIR := ./build-stm32f429_discovery
+CONFDIR  := ./cfg/stm32f429_discovery
+BUILDDIR := ./build/stm32f429_discovery
 DEPDIR   := ./.dep-stm32f429_discovery
 
 # Licensing files.
diff --git a/testhal/STM32/multi/PAL/Makefile-stm32f746_discovery b/testhal/STM32/multi/PAL/make/stm32f746_discovery
old mode 100755
new mode 100644
similarity index 95%
rename from testhal/STM32/multi/PAL/Makefile-stm32f746_discovery
rename to testhal/STM32/multi/PAL/make/stm32f746_discovery
index d98fb3662..726d7ec02
--- a/testhal/STM32/multi/PAL/Makefile-stm32f746_discovery
+++ b/testhal/STM32/multi/PAL/make/stm32f746_discovery
@@ -92,8 +92,8 @@ PROJECT = ch
 
 # Imported source files and paths
 CHIBIOS  := ../../../..
-CONFDIR  := ./cfg-stm32f746_discovery
-BUILDDIR := ./build-stm32f746_discovery
+CONFDIR  := ./cfg/stm32f746_discovery
+BUILDDIR := ./build/stm32f746_discovery
 DEPDIR   := ./.dep-stm32f746_discovery
 
 # Licensing files.
diff --git a/testhal/STM32/multi/PAL/Makefile-stm32l053_discovery b/testhal/STM32/multi/PAL/make/stm32l053_discovery
similarity index 95%
rename from testhal/STM32/multi/PAL/Makefile-stm32l053_discovery
rename to testhal/STM32/multi/PAL/make/stm32l053_discovery
index 41f41fe3a..3b9522d9a 100644
--- a/testhal/STM32/multi/PAL/Makefile-stm32l053_discovery
+++ b/testhal/STM32/multi/PAL/make/stm32l053_discovery
@@ -82,8 +82,8 @@ PROJECT = ch
 
 # Imported source files and paths
 CHIBIOS  := ../../../..
-CONFDIR  := ./cfg-stm32l053_discovery
-BUILDDIR := ./build-stm32l053_discovery
+CONFDIR  := ./cfg/stm32l053_discovery
+BUILDDIR := ./build/stm32l053_discovery
 DEPDIR   := ./.dep-stm32l053_discovery
 
 # Licensing files.
diff --git a/testhal/STM32/multi/PAL/Makefile-stm32l151_discovery b/testhal/STM32/multi/PAL/make/stm32l151_discovery
old mode 100755
new mode 100644
similarity index 95%
rename from testhal/STM32/multi/PAL/Makefile-stm32l151_discovery
rename to testhal/STM32/multi/PAL/make/stm32l151_discovery
index 8815afada..186043608
--- a/testhal/STM32/multi/PAL/Makefile-stm32l151_discovery
+++ b/testhal/STM32/multi/PAL/make/stm32l151_discovery
@@ -82,8 +82,8 @@ PROJECT = ch
 
 # Imported source files and paths
 CHIBIOS  := ../../../..
-CONFDIR  := ./cfg-stm32l151_discovery
-BUILDDIR := ./build-stm32l151_discovery
+CONFDIR  := ./cfg/stm32l151_discovery
+BUILDDIR := ./build/stm32l151_discovery
 DEPDIR   := ./.dep-stm32l151_discovery
 
 # Licensing files.
diff --git a/testhal/STM32/multi/PAL/Makefile-stm32l476_discovery b/testhal/STM32/multi/PAL/make/stm32l476_discovery
similarity index 95%
rename from testhal/STM32/multi/PAL/Makefile-stm32l476_discovery
rename to testhal/STM32/multi/PAL/make/stm32l476_discovery
index ff39bce07..99722a0a0 100644
--- a/testhal/STM32/multi/PAL/Makefile-stm32l476_discovery
+++ b/testhal/STM32/multi/PAL/make/stm32l476_discovery
@@ -92,8 +92,8 @@ PROJECT = ch
 
 # Imported source files and paths
 CHIBIOS  := ../../../..
-CONFDIR  := ./cfg-stm32l476_discovery
-BUILDDIR := ./build-stm32l476_discovery
+CONFDIR  := ./cfg/stm32l476_discovery
+BUILDDIR := ./build/stm32l476_discovery
 DEPDIR   := ./.dep-stm32l476_discovery
 
 # Licensing files.