From b3fe2fa43b91e429c8a600e5a3e6d2ec7d9bb4b1 Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Sun, 21 Oct 2018 18:48:24 +0000
Subject: [PATCH] git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12385
 110e8d01-0319-4d1e-a829-52ad28d1bb01

---
 demos/STM32/RT-STM32-LWIP-FATFS-USB/.cproject |   6 +-
 demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile  |  12 +-
 .../stm32f107_goldbull}/chconf.h              |   0
 .../stm32f107_goldbull}/halconf.h             |   0
 .../stm32f107_goldbull}/mcuconf.h             |   0
 .../stm32f107_goldbull}/portab.c              |   0
 .../stm32f107_goldbull}/portab.h              |   0
 .../stm32f407_olimex}/chconf.h                |   0
 .../stm32f407_olimex}/halconf.h               |   0
 .../stm32f407_olimex}/mcuconf.h               |  36 +++---
 .../stm32f407_olimex}/portab.c                |   0
 .../stm32f407_olimex}/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
 .../stm32f107_goldbull.make}                  | 120 +++++++-----------
 .../stm32f407_olimex.make}                    | 120 +++++++-----------
 .../stm32f746_discovery.make}                 | 115 ++++++-----------
 20 files changed, 160 insertions(+), 249 deletions(-)
 rename demos/STM32/RT-STM32-LWIP-FATFS-USB/{cfg-stm32f107_goldbull => cfg/stm32f107_goldbull}/chconf.h (100%)
 rename demos/STM32/RT-STM32-LWIP-FATFS-USB/{cfg-stm32f107_goldbull => cfg/stm32f107_goldbull}/halconf.h (100%)
 rename demos/STM32/RT-STM32-LWIP-FATFS-USB/{cfg-stm32f107_goldbull => cfg/stm32f107_goldbull}/mcuconf.h (100%)
 rename demos/STM32/RT-STM32-LWIP-FATFS-USB/{cfg-stm32f107_goldbull => cfg/stm32f107_goldbull}/portab.c (100%)
 rename demos/STM32/RT-STM32-LWIP-FATFS-USB/{cfg-stm32f107_goldbull => cfg/stm32f107_goldbull}/portab.h (100%)
 rename demos/STM32/RT-STM32-LWIP-FATFS-USB/{cfg-stm32f407_olimex => cfg/stm32f407_olimex}/chconf.h (100%)
 rename demos/STM32/RT-STM32-LWIP-FATFS-USB/{cfg-stm32f407_olimex => cfg/stm32f407_olimex}/halconf.h (100%)
 rename demos/STM32/RT-STM32-LWIP-FATFS-USB/{cfg-stm32f407_olimex => cfg/stm32f407_olimex}/mcuconf.h (92%)
 rename demos/STM32/RT-STM32-LWIP-FATFS-USB/{cfg-stm32f407_olimex => cfg/stm32f407_olimex}/portab.c (100%)
 rename demos/STM32/RT-STM32-LWIP-FATFS-USB/{cfg-stm32f407_olimex => cfg/stm32f407_olimex}/portab.h (100%)
 rename demos/STM32/RT-STM32-LWIP-FATFS-USB/{cfg-stm32f746_discovery => cfg/stm32f746_discovery}/chconf.h (100%)
 rename demos/STM32/RT-STM32-LWIP-FATFS-USB/{cfg-stm32f746_discovery => cfg/stm32f746_discovery}/halconf.h (100%)
 rename demos/STM32/RT-STM32-LWIP-FATFS-USB/{cfg-stm32f746_discovery => cfg/stm32f746_discovery}/mcuconf.h (100%)
 rename demos/STM32/RT-STM32-LWIP-FATFS-USB/{cfg-stm32f746_discovery => cfg/stm32f746_discovery}/portab.c (100%)
 rename demos/STM32/RT-STM32-LWIP-FATFS-USB/{cfg-stm32f746_discovery => cfg/stm32f746_discovery}/portab.h (100%)
 rename demos/STM32/RT-STM32-LWIP-FATFS-USB/{Makefile-stm32f107_goldbull => make/stm32f107_goldbull.make} (63%)
 rename demos/STM32/RT-STM32-LWIP-FATFS-USB/{Makefile-stm32f407_olimex => make/stm32f407_olimex.make} (63%)
 rename demos/STM32/RT-STM32-LWIP-FATFS-USB/{Makefile-stm32f746_discovery => make/stm32f746_discovery.make} (62%)

diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB/.cproject b/demos/STM32/RT-STM32-LWIP-FATFS-USB/.cproject
index 06ce21495..b1bf5fda8 100644
--- a/demos/STM32/RT-STM32-LWIP-FATFS-USB/.cproject
+++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB/.cproject
@@ -60,7 +60,7 @@
 					<folderInfo id="0.1570569554.1629784558." name="/" resourcePath="">
 						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1578189045" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
 							<targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="org.eclipse.cdt.build.core.prefbase.toolchain.1578189045.328762513" name=""/>
-							<builder arguments="-f Makefile-stm32f746_discovery" command="make" id="org.eclipse.cdt.build.core.settings.default.builder.339968776" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
+							<builder arguments="-f make/stm32f746_discovery.make" command="make" id="org.eclipse.cdt.build.core.settings.default.builder.339968776" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1142929379" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.1147455862" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
 								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.1688616224" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths"/>
@@ -101,7 +101,7 @@
 					<folderInfo id="0.1570569554.95389811." name="/" resourcePath="">
 						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1439667896" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
 							<targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="org.eclipse.cdt.build.core.prefbase.toolchain.1439667896.2962069" name=""/>
-							<builder arguments="-f Makefile-stm32f407_olimex" command="make" id="org.eclipse.cdt.build.core.settings.default.builder.199921010" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
+							<builder arguments="-f make/stm32f407_olimex.make" command="make" id="org.eclipse.cdt.build.core.settings.default.builder.199921010" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1938739117" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.2059891059" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
 								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.1405585713" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths"/>
@@ -142,7 +142,7 @@
 					<folderInfo id="0.1570569554.95389811.2077839933." name="/" resourcePath="">
 						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.316395724" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
 							<targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="org.eclipse.cdt.build.core.prefbase.toolchain.316395724.1527335111" name=""/>
-							<builder arguments="-f Makefile-stm32f107_goldbull" command="make" id="org.eclipse.cdt.build.core.settings.default.builder.2066535313" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
+							<builder arguments="-f make/stm32f107_goldbull.make" command="make" id="org.eclipse.cdt.build.core.settings.default.builder.2066535313" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1773244460" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.107545100" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
 								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.1947257683" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths"/>
diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile b/demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile
index bd1503743..e4731238f 100644
--- a/demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile
+++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile
@@ -5,25 +5,25 @@
 all:
 	@echo
 	@echo === Building for STM32F407-Olimex ==================================
-	+@make --no-print-directory -f Makefile-stm32f407_olimex all
+	+@make --no-print-directory -f make/stm32f407_olimex.make 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.make all
 	@echo ====================================================================
 	@echo
 	@echo === Building for STM32F107-GoldBull ================================
-	+@make --no-print-directory -f Makefile-stm32f107_goldbull all
+	+@make --no-print-directory -f make/stm32f107_goldbull.make all
 	@echo ====================================================================
 	@echo
 
 clean:
 	@echo
-	+@make --no-print-directory -f Makefile-stm32f407_olimex clean
+	+@make --no-print-directory -f make/stm32f407_olimex.make clean
 	@echo
-	+@make --no-print-directory -f Makefile-stm32f746_discovery clean
+	+@make --no-print-directory -f make/stm32f746_discovery.make clean
 	@echo
-	+@make --no-print-directory -f Makefile-stm32f107_goldbull clean
+	+@make --no-print-directory -f make/stm32f107_goldbull.make clean
 	@echo
 #
 ##############################################################################
diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg-stm32f107_goldbull/chconf.h b/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f107_goldbull/chconf.h
similarity index 100%
rename from demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg-stm32f107_goldbull/chconf.h
rename to demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f107_goldbull/chconf.h
diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg-stm32f107_goldbull/halconf.h b/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f107_goldbull/halconf.h
similarity index 100%
rename from demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg-stm32f107_goldbull/halconf.h
rename to demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f107_goldbull/halconf.h
diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg-stm32f107_goldbull/mcuconf.h b/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f107_goldbull/mcuconf.h
similarity index 100%
rename from demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg-stm32f107_goldbull/mcuconf.h
rename to demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f107_goldbull/mcuconf.h
diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg-stm32f107_goldbull/portab.c b/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f107_goldbull/portab.c
similarity index 100%
rename from demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg-stm32f107_goldbull/portab.c
rename to demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f107_goldbull/portab.c
diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg-stm32f107_goldbull/portab.h b/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f107_goldbull/portab.h
similarity index 100%
rename from demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg-stm32f107_goldbull/portab.h
rename to demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f107_goldbull/portab.h
diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg-stm32f407_olimex/chconf.h b/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f407_olimex/chconf.h
similarity index 100%
rename from demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg-stm32f407_olimex/chconf.h
rename to demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f407_olimex/chconf.h
diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg-stm32f407_olimex/halconf.h b/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f407_olimex/halconf.h
similarity index 100%
rename from demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg-stm32f407_olimex/halconf.h
rename to demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f407_olimex/halconf.h
diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg-stm32f407_olimex/mcuconf.h b/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f407_olimex/mcuconf.h
similarity index 92%
rename from demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg-stm32f407_olimex/mcuconf.h
rename to demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f407_olimex/mcuconf.h
index bdbf6ad39..48f1053c8 100644
--- a/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg-stm32f407_olimex/mcuconf.h
+++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f407_olimex/mcuconf.h
@@ -64,6 +64,24 @@
 #define STM32_PLS                           STM32_PLS_LEV0
 #define STM32_BKPRAM_ENABLE                 FALSE
 
+/*
+ * IRQ system settings.
+ */
+#define STM32_IRQ_EXTI0_PRIORITY            6
+#define STM32_IRQ_EXTI1_PRIORITY            6
+#define STM32_IRQ_EXTI2_PRIORITY            6
+#define STM32_IRQ_EXTI3_PRIORITY            6
+#define STM32_IRQ_EXTI4_PRIORITY            6
+#define STM32_IRQ_EXTI5_9_PRIORITY          6
+#define STM32_IRQ_EXTI10_15_PRIORITY        6
+#define STM32_IRQ_EXTI16_PRIORITY           6
+#define STM32_IRQ_EXTI17_PRIORITY           15
+#define STM32_IRQ_EXTI18_PRIORITY           6
+#define STM32_IRQ_EXTI19_PRIORITY           6
+#define STM32_IRQ_EXTI20_PRIORITY           6
+#define STM32_IRQ_EXTI21_PRIORITY           15
+#define STM32_IRQ_EXTI22_PRIORITY           15
+
 /*
  * ADC driver system settings.
  */
@@ -103,24 +121,6 @@
 #define STM32_DAC_DAC1_CH1_DMA_STREAM       STM32_DMA_STREAM_ID(1, 5)
 #define STM32_DAC_DAC1_CH2_DMA_STREAM       STM32_DMA_STREAM_ID(1, 6)
 
-/*
- * EXT driver system settings.
- */
-#define STM32_EXT_EXTI0_IRQ_PRIORITY        6
-#define STM32_EXT_EXTI1_IRQ_PRIORITY        6
-#define STM32_EXT_EXTI2_IRQ_PRIORITY        6
-#define STM32_EXT_EXTI3_IRQ_PRIORITY        6
-#define STM32_EXT_EXTI4_IRQ_PRIORITY        6
-#define STM32_EXT_EXTI5_9_IRQ_PRIORITY      6
-#define STM32_EXT_EXTI10_15_IRQ_PRIORITY    6
-#define STM32_EXT_EXTI16_IRQ_PRIORITY       6
-#define STM32_EXT_EXTI17_IRQ_PRIORITY       15
-#define STM32_EXT_EXTI18_IRQ_PRIORITY       6
-#define STM32_EXT_EXTI19_IRQ_PRIORITY       6
-#define STM32_EXT_EXTI20_IRQ_PRIORITY       6
-#define STM32_EXT_EXTI21_IRQ_PRIORITY       15
-#define STM32_EXT_EXTI22_IRQ_PRIORITY       15
-
 /*
  * GPT driver system settings.
  */
diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg-stm32f407_olimex/portab.c b/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f407_olimex/portab.c
similarity index 100%
rename from demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg-stm32f407_olimex/portab.c
rename to demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f407_olimex/portab.c
diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg-stm32f407_olimex/portab.h b/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f407_olimex/portab.h
similarity index 100%
rename from demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg-stm32f407_olimex/portab.h
rename to demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f407_olimex/portab.h
diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg-stm32f746_discovery/chconf.h b/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f746_discovery/chconf.h
similarity index 100%
rename from demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg-stm32f746_discovery/chconf.h
rename to demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f746_discovery/chconf.h
diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg-stm32f746_discovery/halconf.h b/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f746_discovery/halconf.h
similarity index 100%
rename from demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg-stm32f746_discovery/halconf.h
rename to demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f746_discovery/halconf.h
diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg-stm32f746_discovery/mcuconf.h b/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f746_discovery/mcuconf.h
similarity index 100%
rename from demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg-stm32f746_discovery/mcuconf.h
rename to demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f746_discovery/mcuconf.h
diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg-stm32f746_discovery/portab.c b/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f746_discovery/portab.c
similarity index 100%
rename from demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg-stm32f746_discovery/portab.c
rename to demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f746_discovery/portab.c
diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg-stm32f746_discovery/portab.h b/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f746_discovery/portab.h
similarity index 100%
rename from demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg-stm32f746_discovery/portab.h
rename to demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f746_discovery/portab.h
diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile-stm32f107_goldbull b/demos/STM32/RT-STM32-LWIP-FATFS-USB/make/stm32f107_goldbull.make
similarity index 63%
rename from demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile-stm32f107_goldbull
rename to demos/STM32/RT-STM32-LWIP-FATFS-USB/make/stm32f107_goldbull.make
index f79b87c09..4bfe30dd4 100644
--- a/demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile-stm32f107_goldbull
+++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB/make/stm32f107_goldbull.make
@@ -18,7 +18,7 @@ ifeq ($(USE_CPPOPT),)
   USE_CPPOPT = -fno-rtti
 endif
 
-# Enable this if you want the linker to remove unused code and data
+# Enable this if you want the linker to remove unused code and data.
 ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes
 endif
@@ -28,16 +28,11 @@ ifeq ($(USE_LDOPT),)
   USE_LDOPT = 
 endif
 
-# Enable this if you want link time optimizations (LTO)
+# Enable this if you want link time optimizations (LTO).
 ifeq ($(USE_LTO),)
   USE_LTO = yes
 endif
 
-# If enabled, this option allows to compile the application in THUMB mode.
-ifeq ($(USE_THUMB),)
-  USE_THUMB = yes
-endif
-
 # Enable this if you want to see the full log while compiling.
 ifeq ($(USE_VERBOSE_COMPILE),)
   USE_VERBOSE_COMPILE = no
@@ -74,22 +69,30 @@ ifeq ($(USE_FPU),)
   USE_FPU = no
 endif
 
+# FPU-related options.
+ifeq ($(USE_FPU_OPT),)
+  USE_FPU_OPT = -mfloat-abi=$(USE_FPU) -mfpu=fpv4-sp-d16
+endif
+
 #
 # Architecture or project specific options
 ##############################################################################
 
 ##############################################################################
-# Project, sources and paths
+# Project, target, sources and paths
 #
 
 # Define project name here
 PROJECT = ch
-CONFDIR  := ./cfg-stm32f107_goldbull
-BUILDDIR := ./build-stm32f107_goldbull
-DEPDIR   := ./.dep-stm32f107_goldbull
 
-# Imported source files and paths
-CHIBIOS = ../../..
+# Target settings.
+MCU  = cortex-m3
+
+# Imported source files and paths.
+CHIBIOS  := ../../..
+CONFDIR  := ./cfg/stm32f107_goldbull
+BUILDDIR := ./build/stm32f107_goldbull
+DEPDIR   := ./.dep/stm32f107_goldbull
 
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
@@ -103,6 +106,8 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk
 # RTOS files (optional).
 include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
+# Auto-build files in ./source recursively.
+include $(CHIBIOS)/tools/mk/autobuild.mk
 # Other files (optional).
 include $(CHIBIOS)/test/lib/test.mk
 include $(CHIBIOS)/test/rt/rt_test.mk
@@ -121,79 +126,29 @@ CSRC = $(ALLCSRC) \
        $(TESTSRC) \
        $(CHIBIOS)/os/various/evtimer.c \
        $(CONFDIR)/portab.c \
-       src/usbcfg.c main.c
+       main.c
 
 # C++ sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
-CPPSRC =
+CPPSRC = $(ALLCPPSRC)
 
-# C sources to be compiled in ARM mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-ACSRC =
-
-# C++ sources to be compiled in ARM mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-ACPPSRC =
-
-# C sources to be compiled in THUMB mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-TCSRC =
-
-# C sources to be compiled in THUMB mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-TCPPSRC =
-
-# List ASM source files here
+# List ASM source files here.
 ASMSRC = $(ALLASMSRC)
-ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
 
-INCDIR = $(ALLINC) $(TESTINC) $(CONFDIR) ./cfg ./src
+# List ASM with preprocessor source files here.
+ASMXSRC = $(ALLXASMSRC)
 
-#
-# Project, sources and paths
-##############################################################################
+# Inclusion directories.
+INCDIR = $(CONFDIR) $(ALLINC) $(TESTINC) ./cfg
 
-##############################################################################
-# Compiler settings
-#
-
-MCU  = cortex-m3
-
-#TRGT = arm-elf-
-TRGT = arm-none-eabi-
-CC   = $(TRGT)gcc
-CPPC = $(TRGT)g++
-# Enable loading with g++ only if you need C++ runtime support.
-# NOTE: You can use C++ even without C++ support if you are careful. C++
-#       runtime support makes code size explode.
-LD   = $(TRGT)gcc
-#LD   = $(TRGT)g++
-CP   = $(TRGT)objcopy
-AS   = $(TRGT)gcc -x assembler-with-cpp
-AR   = $(TRGT)ar
-OD   = $(TRGT)objdump
-SZ   = $(TRGT)size
-HEX  = $(CP) -O ihex
-BIN  = $(CP) -O binary
-
-# ARM-specific options here
-AOPT =
-
-# THUMB-specific options here
-TOPT = -mthumb -DTHUMB
-
-# Define C warning options here
+# Define C warning options here.
 CWARN = -Wall -Wextra -Wundef -Wstrict-prototypes
 
-# Define C++ warning options here
+# Define C++ warning options here.
 CPPWARN = -Wall -Wextra -Wundef
 
 #
-# Compiler settings
+# Project, target, sources and paths
 ##############################################################################
 
 ##############################################################################
@@ -216,8 +171,25 @@ ULIBDIR =
 ULIBS =
 
 #
-# End of user defines
+# End of user section
 ##############################################################################
 
+##############################################################################
+# Common rules
+#
+
 RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
+include $(RULESPATH)/arm-none-eabi.mk
 include $(RULESPATH)/rules.mk
+
+#
+# Common rules
+##############################################################################
+
+##############################################################################
+# Custom rules
+#
+
+#
+# Custom rules
+##############################################################################
diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile-stm32f407_olimex b/demos/STM32/RT-STM32-LWIP-FATFS-USB/make/stm32f407_olimex.make
similarity index 63%
rename from demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile-stm32f407_olimex
rename to demos/STM32/RT-STM32-LWIP-FATFS-USB/make/stm32f407_olimex.make
index 5887ee203..7751f64f0 100644
--- a/demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile-stm32f407_olimex
+++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB/make/stm32f407_olimex.make
@@ -18,7 +18,7 @@ ifeq ($(USE_CPPOPT),)
   USE_CPPOPT = -fno-rtti
 endif
 
-# Enable this if you want the linker to remove unused code and data
+# Enable this if you want the linker to remove unused code and data.
 ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes
 endif
@@ -28,16 +28,11 @@ ifeq ($(USE_LDOPT),)
   USE_LDOPT = 
 endif
 
-# Enable this if you want link time optimizations (LTO)
+# Enable this if you want link time optimizations (LTO).
 ifeq ($(USE_LTO),)
   USE_LTO = yes
 endif
 
-# If enabled, this option allows to compile the application in THUMB mode.
-ifeq ($(USE_THUMB),)
-  USE_THUMB = yes
-endif
-
 # Enable this if you want to see the full log while compiling.
 ifeq ($(USE_VERBOSE_COMPILE),)
   USE_VERBOSE_COMPILE = no
@@ -74,22 +69,30 @@ ifeq ($(USE_FPU),)
   USE_FPU = no
 endif
 
+# FPU-related options.
+ifeq ($(USE_FPU_OPT),)
+  USE_FPU_OPT = -mfloat-abi=$(USE_FPU) -mfpu=fpv4-sp-d16
+endif
+
 #
 # Architecture or project specific options
 ##############################################################################
 
 ##############################################################################
-# Project, sources and paths
+# Project, target, sources and paths
 #
 
 # Define project name here
 PROJECT = ch
-CONFDIR  := ./cfg-stm32f407_olimex
-BUILDDIR := ./build-stm32f407_olimex
-DEPDIR   := ./.dep-stm32f407_olimex
 
-# Imported source files and paths
-CHIBIOS = ../../..
+# Target settings.
+MCU  = cortex-m4
+
+# Imported source files and paths.
+CHIBIOS  := ../../..
+CONFDIR  := ./cfg/stm32f407_olimex
+BUILDDIR := ./build/stm32f407_olimex
+DEPDIR   := ./.dep/stm32f407_olimex
 
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
@@ -98,11 +101,13 @@ include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.m
 # HAL-OSAL files (optional).
 include $(CHIBIOS)/os/hal/hal.mk
 include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk
-include $(CHIBIOS)/os/hal/boards/OLIMEX_STM32_E407_REV_D/board.mk
+include $(CHIBIOS)/os/hal/boards/OLIMEX_STM32_E407/board.mk
 include $(CHIBIOS)/os/hal/osal/rt/osal.mk
 # RTOS files (optional).
 include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
+# Auto-build files in ./source recursively.
+include $(CHIBIOS)/tools/mk/autobuild.mk
 # Other files (optional).
 include $(CHIBIOS)/test/lib/test.mk
 include $(CHIBIOS)/test/rt/rt_test.mk
@@ -121,79 +126,29 @@ CSRC = $(ALLCSRC) \
        $(TESTSRC) \
        $(CHIBIOS)/os/various/evtimer.c \
        $(CONFDIR)/portab.c \
-       src/usbcfg.c main.c
+       main.c
 
 # C++ sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
 CPPSRC = $(ALLCPPSRC)
 
-# C sources to be compiled in ARM mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-ACSRC =
-
-# C++ sources to be compiled in ARM mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-ACPPSRC =
-
-# C sources to be compiled in THUMB mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-TCSRC =
-
-# C sources to be compiled in THUMB mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-TCPPSRC =
-
-# List ASM source files here
+# List ASM source files here.
 ASMSRC = $(ALLASMSRC)
+
+# List ASM with preprocessor source files here.
 ASMXSRC = $(ALLXASMSRC)
 
-INCDIR = $(ALLINC) $(TESTINC) $(CONFDIR) ./cfg ./src
+# Inclusion directories.
+INCDIR = $(CONFDIR) $(ALLINC) $(TESTINC) ./cfg
 
-#
-# Project, sources and paths
-##############################################################################
-
-##############################################################################
-# Compiler settings
-#
-
-MCU  = cortex-m4
-
-#TRGT = arm-elf-
-TRGT = arm-none-eabi-
-CC   = $(TRGT)gcc
-CPPC = $(TRGT)g++
-# Enable loading with g++ only if you need C++ runtime support.
-# NOTE: You can use C++ even without C++ support if you are careful. C++
-#       runtime support makes code size explode.
-LD   = $(TRGT)gcc
-#LD   = $(TRGT)g++
-CP   = $(TRGT)objcopy
-AS   = $(TRGT)gcc -x assembler-with-cpp
-AR   = $(TRGT)ar
-OD   = $(TRGT)objdump
-SZ   = $(TRGT)size
-HEX  = $(CP) -O ihex
-BIN  = $(CP) -O binary
-
-# ARM-specific options here
-AOPT =
-
-# THUMB-specific options here
-TOPT = -mthumb -DTHUMB
-
-# Define C warning options here
+# Define C warning options here.
 CWARN = -Wall -Wextra -Wundef -Wstrict-prototypes
 
-# Define C++ warning options here
+# Define C++ warning options here.
 CPPWARN = -Wall -Wextra -Wundef
 
 #
-# Compiler settings
+# Project, target, sources and paths
 ##############################################################################
 
 ##############################################################################
@@ -216,8 +171,25 @@ ULIBDIR =
 ULIBS =
 
 #
-# End of user defines
+# End of user section
 ##############################################################################
 
+##############################################################################
+# Common rules
+#
+
 RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
+include $(RULESPATH)/arm-none-eabi.mk
 include $(RULESPATH)/rules.mk
+
+#
+# Common rules
+##############################################################################
+
+##############################################################################
+# Custom rules
+#
+
+#
+# Custom rules
+##############################################################################
diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile-stm32f746_discovery b/demos/STM32/RT-STM32-LWIP-FATFS-USB/make/stm32f746_discovery.make
similarity index 62%
rename from demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile-stm32f746_discovery
rename to demos/STM32/RT-STM32-LWIP-FATFS-USB/make/stm32f746_discovery.make
index b033e1516..4955dfdbc 100644
--- a/demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile-stm32f746_discovery
+++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB/make/stm32f746_discovery.make
@@ -18,7 +18,7 @@ ifeq ($(USE_CPPOPT),)
   USE_CPPOPT = -fno-rtti
 endif
 
-# Enable this if you want the linker to remove unused code and data
+# Enable this if you want the linker to remove unused code and data.
 ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes
 endif
@@ -28,16 +28,11 @@ ifeq ($(USE_LDOPT),)
   USE_LDOPT = 
 endif
 
-# Enable this if you want link time optimizations (LTO)
+# Enable this if you want link time optimizations (LTO).
 ifeq ($(USE_LTO),)
   USE_LTO = yes
 endif
 
-# If enabled, this option allows to compile the application in THUMB mode.
-ifeq ($(USE_THUMB),)
-  USE_THUMB = yes
-endif
-
 # Enable this if you want to see the full log while compiling.
 ifeq ($(USE_VERBOSE_COMPILE),)
   USE_VERBOSE_COMPILE = no
@@ -76,7 +71,7 @@ endif
 
 # FPU-related options.
 ifeq ($(USE_FPU_OPT),)
-  USE_FPU_OPT = -mfloat-abi=$(USE_FPU) -mfpu=fpv5-sp-d16 -fsingle-precision-constant
+  USE_FPU_OPT = -mfloat-abi=$(USE_FPU) -mfpu=fpv5-sp-d16
 endif
 
 #
@@ -84,17 +79,20 @@ endif
 ##############################################################################
 
 ##############################################################################
-# Project, sources and paths
+# Project, target, sources and paths
 #
 
 # Define project name here
 PROJECT = ch
-CONFDIR  := ./cfg-stm32f746_discovery
-BUILDDIR := ./build-stm32f746_discovery
-DEPDIR   := ./.dep-stm32f746_discovery
 
-# Imported source files and paths
-CHIBIOS = ../../..
+# Target settings.
+MCU  = cortex-m4
+
+# Imported source files and paths.
+CHIBIOS  := ../../..
+CONFDIR  := ./cfg/stm32f746_discovery
+BUILDDIR := ./build/stm32f746_discovery
+DEPDIR   := ./.dep/stm32f746_discovery
 
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
@@ -108,6 +106,8 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk
 # RTOS files (optional).
 include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
+# Auto-build files in ./source recursively.
+include $(CHIBIOS)/tools/mk/autobuild.mk
 # Other files (optional).
 include $(CHIBIOS)/test/lib/test.mk
 include $(CHIBIOS)/test/rt/rt_test.mk
@@ -126,79 +126,29 @@ CSRC = $(ALLCSRC) \
        $(TESTSRC) \
        $(CHIBIOS)/os/various/evtimer.c \
        $(CONFDIR)/portab.c \
-       src/usbcfg.c main.c
+       main.c
 
 # C++ sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
 CPPSRC = $(ALLCPPSRC)
 
-# C sources to be compiled in ARM mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-ACSRC =
-
-# C++ sources to be compiled in ARM mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-ACPPSRC =
-
-# C sources to be compiled in THUMB mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-TCSRC =
-
-# C sources to be compiled in THUMB mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-TCPPSRC =
-
-# List ASM source files here
+# List ASM source files here.
 ASMSRC = $(ALLASMSRC)
+
+# List ASM with preprocessor source files here.
 ASMXSRC = $(ALLXASMSRC)
 
-INCDIR = $(ALLINC) $(TESTINC) $(CONFDIR) ./cfg ./src
+# Inclusion directories.
+INCDIR = $(CONFDIR) $(ALLINC) $(TESTINC) ./cfg
 
-#
-# Project, sources and paths
-##############################################################################
-
-##############################################################################
-# Compiler settings
-#
-
-MCU  = cortex-m7
-
-#TRGT = arm-elf-
-TRGT = arm-none-eabi-
-CC   = $(TRGT)gcc
-CPPC = $(TRGT)g++
-# Enable loading with g++ only if you need C++ runtime support.
-# NOTE: You can use C++ even without C++ support if you are careful. C++
-#       runtime support makes code size explode.
-LD   = $(TRGT)gcc
-#LD   = $(TRGT)g++
-CP   = $(TRGT)objcopy
-AS   = $(TRGT)gcc -x assembler-with-cpp
-AR   = $(TRGT)ar
-OD   = $(TRGT)objdump
-SZ   = $(TRGT)size
-HEX  = $(CP) -O ihex
-BIN  = $(CP) -O binary
-
-# ARM-specific options here
-AOPT =
-
-# THUMB-specific options here
-TOPT = -mthumb -DTHUMB
-
-# Define C warning options here
+# Define C warning options here.
 CWARN = -Wall -Wextra -Wundef -Wstrict-prototypes
 
-# Define C++ warning options here
+# Define C++ warning options here.
 CPPWARN = -Wall -Wextra -Wundef
 
 #
-# Compiler settings
+# Project, target, sources and paths
 ##############################################################################
 
 ##############################################################################
@@ -221,8 +171,25 @@ ULIBDIR =
 ULIBS =
 
 #
-# End of user defines
+# End of user section
 ##############################################################################
 
+##############################################################################
+# Common rules
+#
+
 RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
+include $(RULESPATH)/arm-none-eabi.mk
 include $(RULESPATH)/rules.mk
+
+#
+# Common rules
+##############################################################################
+
+##############################################################################
+# Custom rules
+#
+
+#
+# Custom rules
+##############################################################################