More makefiles updated.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11109 35acf78f-673a-0410-8e92-d51de3d6d3f4

10 files changed, 213 insertions, 171 deletions

diff --git a/testhal/STM32/multi/PAL/.cproject b/testhal/STM32/multi/PAL/.cproject
index 0940ccb9e..eead9dc11 100644
--- a/testhal/STM32/multi/PAL/.cproject
+++ b/testhal/STM32/multi/PAL/.cproject
@@ -379,12 +379,6 @@
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">

 		<project id="STM32-PAL.null.932840044" name="STM32-PAL"/>

 	</storageModule>

-	<storageModule moduleId="scannerConfiguration">

-		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>

-		<scannerConfigBuildInfo instanceId="0.1093754934">

-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>

-		</scannerConfigBuildInfo>

-	</storageModule>

 	<storageModule moduleId="refreshScope" versionNumber="2">

 		<configuration configurationName="Build for STM32F407-Discovery">

 			<resource resourceType="PROJECT" workspacePath="/STM32-PAL"/>

@@ -414,4 +408,40 @@
 		</configuration>

 	</storageModule>

 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

+	<storageModule moduleId="scannerConfiguration">

+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>

+		<scannerConfigBuildInfo instanceId="0.1093754934.69471493">

+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"/>

+		</scannerConfigBuildInfo>

+		<scannerConfigBuildInfo instanceId="0.1093754934">

+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>

+		</scannerConfigBuildInfo>

+		<scannerConfigBuildInfo instanceId="0.1093754934.1317617301">

+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"/>

+		</scannerConfigBuildInfo>

+		<scannerConfigBuildInfo instanceId="0.1093754934.532782958.134374917">

+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"/>

+		</scannerConfigBuildInfo>

+		<scannerConfigBuildInfo instanceId="0.1093754934.532782958">

+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"/>

+		</scannerConfigBuildInfo>

+		<scannerConfigBuildInfo instanceId="0.1093754934.1927962071">

+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"/>

+		</scannerConfigBuildInfo>

+		<scannerConfigBuildInfo instanceId="0.1093754934.1746620542">

+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"/>

+		</scannerConfigBuildInfo>

+		<scannerConfigBuildInfo instanceId="0.1093754934.1666172521">

+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"/>

+		</scannerConfigBuildInfo>

+		<scannerConfigBuildInfo instanceId="0.1093754934.366574680">

+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"/>

+		</scannerConfigBuildInfo>

+		<scannerConfigBuildInfo instanceId="0.1093754934.237698851">

+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"/>

+		</scannerConfigBuildInfo>

+		<scannerConfigBuildInfo instanceId="0.1093754934.1834762588">

+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"/>

+		</scannerConfigBuildInfo>

+	</storageModule>

 </cproject>

diff --git a/testhal/STM32/multi/PAL/Makefile-stm32f303_discovery b/testhal/STM32/multi/PAL/Makefile-stm32f303_discovery
index 345df1762..f4da289d3 100644
--- a/testhal/STM32/multi/PAL/Makefile-stm32f303_discovery
+++ b/testhal/STM32/multi/PAL/Makefile-stm32f303_discovery
@@ -74,6 +74,11 @@ 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 -fsingle-precision-constant

+endif

+

 #

 # Architecture or project specific options

 ##############################################################################

@@ -91,6 +96,8 @@ CONFDIR  := ./cfg-stm32f303_discovery
 BUILDDIR := ./build-stm32f303_discovery

 DEPDIR   := ./.dep-stm32f303_discovery

 

+# Licensing files.

+include $(CHIBIOS)/os/license/license.mk

 # Startup files.

 include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f3xx.mk

 # HAL-OSAL files (optional).

@@ -101,6 +108,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

@@ -111,20 +120,14 @@ LDSCRIPT= $(STARTUPLD)/STM32F303xC.ld
 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

-CSRC = $(STARTUPSRC) \

-       $(KERNSRC) \

-       $(PORTSRC) \

-       $(OSALSRC) \

-       $(HALSRC) \

-       $(PLATFORMSRC) \

-       $(BOARDSRC) \

+CSRC = $(ALLCSRC) \

        $(TESTSRC) \

        $(CONFDIR)/portab.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

@@ -147,19 +150,39 @@ TCSRC =
 TCPPSRC =

 

 # List ASM source files here

-ASMSRC =

-ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)

+ASMSRC = $(ALLASMSRC)

+ASMXSRC = $(ALLXASMSRC)

 

-INCDIR = $(CHIBIOS)/os/license \

-         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \

-         $(CONFDIR)

+INCDIR = $(ALLINC) $(TESTINC) $(CONFDIR)

 

 #

 # Project, sources and paths

 ##############################################################################

 

 ##############################################################################

+# Start of user section

+#

+

+# List all user C define here, like -D_DEBUG=1

+UDEFS =

+

+# Define ASM defines here

+UADEFS =

+

+# List all user directories here

+UINCDIR =

+

+# List the user directory to look for the libraries here

+ULIBDIR =

+

+# List all user libraries here

+ULIBS =

+

+#

+# End of user section

+##############################################################################

+

+##############################################################################

 # Compiler settings

 #

 

@@ -198,28 +221,5 @@ CPPWARN = -Wall -Wextra -Wundef
 # Compiler settings

 ##############################################################################

 

-##############################################################################

-# Start of user section

-#

-

-# List all user C define here, like -D_DEBUG=1

-UDEFS =

-

-# Define ASM defines here

-UADEFS =

-

-# List all user directories here

-UINCDIR =

-

-# List the user directory to look for the libraries here

-ULIBDIR =

-

-# List all user libraries here

-ULIBS =

-

-#

-# End of user defines

-##############################################################################

-

 RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC

 include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32/multi/PAL/Makefile-stm32f407_discovery b/testhal/STM32/multi/PAL/Makefile-stm32f407_discovery
index 1956d72b1..9615aa0be 100644
--- a/testhal/STM32/multi/PAL/Makefile-stm32f407_discovery
+++ b/testhal/STM32/multi/PAL/Makefile-stm32f407_discovery
@@ -74,6 +74,11 @@ 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 -fsingle-precision-constant

+endif

+

 #

 # Architecture or project specific options

 ##############################################################################

@@ -86,11 +91,13 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS = ../../../..

+CHIBIOS  := ../../../..

 CONFDIR  := ./cfg-stm32f407_discovery

 BUILDDIR := ./build-stm32f407_discovery

 DEPDIR   := ./.dep-stm32f407_discovery

 

+# Licensing files.

+include $(CHIBIOS)/os/license/license.mk

 # Startup files.

 include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk

 # HAL-OSAL files (optional).

@@ -101,6 +108,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

@@ -111,20 +120,14 @@ LDSCRIPT= $(STARTUPLD)/STM32F407xG.ld
 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

-CSRC = $(STARTUPSRC) \

-       $(KERNSRC) \

-       $(PORTSRC) \

-       $(OSALSRC) \

-       $(HALSRC) \

-       $(PLATFORMSRC) \

-       $(BOARDSRC) \

+CSRC = $(ALLCSRC) \

        $(TESTSRC) \

        $(CONFDIR)/portab.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

@@ -147,19 +150,39 @@ TCSRC =
 TCPPSRC =

 

 # List ASM source files here

-ASMSRC =

-ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)

+ASMSRC = $(ALLASMSRC)

+ASMXSRC = $(ALLXASMSRC)

 

-INCDIR = $(CHIBIOS)/os/license \

-         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \

-         $(CONFDIR)

+INCDIR = $(ALLINC) $(TESTINC) $(CONFDIR)

 

 #

 # Project, sources and paths

 ##############################################################################

 

 ##############################################################################

+# Start of user section

+#

+

+# List all user C define here, like -D_DEBUG=1

+UDEFS =

+

+# Define ASM defines here

+UADEFS =

+

+# List all user directories here

+UINCDIR =

+

+# List the user directory to look for the libraries here

+ULIBDIR =

+

+# List all user libraries here

+ULIBS =

+

+#

+# End of user section

+##############################################################################

+

+##############################################################################

 # Compiler settings

 #

 

@@ -198,28 +221,5 @@ CPPWARN = -Wall -Wextra -Wundef
 # Compiler settings

 ##############################################################################

 

-##############################################################################

-# Start of user section

-#

-

-# List all user C define here, like -D_DEBUG=1

-UDEFS =

-

-# Define ASM defines here

-UADEFS =

-

-# List all user directories here

-UINCDIR =

-

-# List the user directory to look for the libraries here

-ULIBDIR =

-

-# List all user libraries here

-ULIBS =

-

-#

-# End of user defines

-##############################################################################

-

 RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC

 include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32/multi/PAL/Makefile-stm32l476_discovery b/testhal/STM32/multi/PAL/Makefile-stm32l476_discovery
index 2ba2911d4..8799125a9 100644
--- a/testhal/STM32/multi/PAL/Makefile-stm32l476_discovery
+++ b/testhal/STM32/multi/PAL/Makefile-stm32l476_discovery
@@ -76,7 +76,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=fpv4-sp-d16 -fsingle-precision-constant

 endif

 

 #

diff --git a/testhal/STM32/multi/PAL/cfg-stm32f429_discovery/halconf.h b/testhal/STM32/multi/PAL/cfg-stm32f429_discovery/halconf.h
index d7793e22c..5aec384f3 100644
--- a/testhal/STM32/multi/PAL/cfg-stm32f429_discovery/halconf.h
+++ b/testhal/STM32/multi/PAL/cfg-stm32f429_discovery/halconf.h
@@ -146,7 +146,7 @@
  * @brief   Enables the SERIAL subsystem.

  */

 #if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL              TRUE

+#define HAL_USE_SERIAL              FALSE

 #endif

 

 /**

diff --git a/testhal/STM32/multi/QSPI-MFS/.cproject b/testhal/STM32/multi/QSPI-MFS/.cproject
index 12472320f..82c6bca09 100644
--- a/testhal/STM32/multi/QSPI-MFS/.cproject
+++ b/testhal/STM32/multi/QSPI-MFS/.cproject
@@ -73,16 +73,19 @@
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">

 		<project id="STM32-QSPI-MFS.null.1829068891" name="STM32-QSPI-MFS"/>

 	</storageModule>

-	<storageModule moduleId="scannerConfiguration">

-		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>

-		<scannerConfigBuildInfo instanceId="0.365230168">

-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>

-		</scannerConfigBuildInfo>

-	</storageModule>

 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

 	<storageModule moduleId="refreshScope" versionNumber="2">

 		<configuration configurationName="Default">

 			<resource resourceType="PROJECT" workspacePath="/STM32-QSPI-MFS"/>

 		</configuration>

 	</storageModule>

+	<storageModule moduleId="scannerConfiguration">

+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>

+		<scannerConfigBuildInfo instanceId="0.365230168.523175374">

+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"/>

+		</scannerConfigBuildInfo>

+		<scannerConfigBuildInfo instanceId="0.365230168">

+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>

+		</scannerConfigBuildInfo>

+	</storageModule>

 </cproject>

diff --git a/testhal/STM32/multi/QSPI-MFS/Makefile-stm32l476_discovery b/testhal/STM32/multi/QSPI-MFS/Makefile-stm32l476_discovery
index 442b0ef9b..3693243ec 100644
--- a/testhal/STM32/multi/QSPI-MFS/Makefile-stm32l476_discovery
+++ b/testhal/STM32/multi/QSPI-MFS/Makefile-stm32l476_discovery
@@ -76,7 +76,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=fpv4-sp-d16 -fsingle-precision-constant

 endif

 

 #

diff --git a/testhal/STM32/multi/SPI/.cproject b/testhal/STM32/multi/SPI/.cproject
index 596542848..ad119b735 100644
--- a/testhal/STM32/multi/SPI/.cproject
+++ b/testhal/STM32/multi/SPI/.cproject
@@ -141,12 +141,6 @@
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">

 		<project id="STM32-SPI.null.932840044" name="STM32-SPI"/>

 	</storageModule>

-	<storageModule moduleId="scannerConfiguration">

-		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>

-		<scannerConfigBuildInfo instanceId="0.1093754934">

-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>

-		</scannerConfigBuildInfo>

-	</storageModule>

 	<storageModule moduleId="refreshScope" versionNumber="2">

 		<configuration configurationName="Build for STM32F407-Discovery">

 			<resource resourceType="PROJECT" workspacePath="/STM32-SPI"/>

@@ -178,4 +172,19 @@
 		</configuration>

 	</storageModule>

 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

+	<storageModule moduleId="scannerConfiguration">

+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>

+		<scannerConfigBuildInfo instanceId="0.1093754934">

+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>

+		</scannerConfigBuildInfo>

+		<scannerConfigBuildInfo instanceId="0.1093754934.532782958.134374917">

+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"/>

+		</scannerConfigBuildInfo>

+		<scannerConfigBuildInfo instanceId="0.1093754934.1516812111">

+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"/>

+		</scannerConfigBuildInfo>

+		<scannerConfigBuildInfo instanceId="0.1093754934.1825368971">

+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"/>

+		</scannerConfigBuildInfo>

+	</storageModule>

 </cproject>

diff --git a/testhal/STM32/multi/SPI/Makefile-stm32f303_discovery b/testhal/STM32/multi/SPI/Makefile-stm32f303_discovery
index 345df1762..f4da289d3 100644
--- a/testhal/STM32/multi/SPI/Makefile-stm32f303_discovery
+++ b/testhal/STM32/multi/SPI/Makefile-stm32f303_discovery
@@ -74,6 +74,11 @@ 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 -fsingle-precision-constant

+endif

+

 #

 # Architecture or project specific options

 ##############################################################################

@@ -91,6 +96,8 @@ CONFDIR  := ./cfg-stm32f303_discovery
 BUILDDIR := ./build-stm32f303_discovery

 DEPDIR   := ./.dep-stm32f303_discovery

 

+# Licensing files.

+include $(CHIBIOS)/os/license/license.mk

 # Startup files.

 include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f3xx.mk

 # HAL-OSAL files (optional).

@@ -101,6 +108,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

@@ -111,20 +120,14 @@ LDSCRIPT= $(STARTUPLD)/STM32F303xC.ld
 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

-CSRC = $(STARTUPSRC) \

-       $(KERNSRC) \

-       $(PORTSRC) \

-       $(OSALSRC) \

-       $(HALSRC) \

-       $(PLATFORMSRC) \

-       $(BOARDSRC) \

+CSRC = $(ALLCSRC) \

        $(TESTSRC) \

        $(CONFDIR)/portab.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

@@ -147,19 +150,39 @@ TCSRC =
 TCPPSRC =

 

 # List ASM source files here

-ASMSRC =

-ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)

+ASMSRC = $(ALLASMSRC)

+ASMXSRC = $(ALLXASMSRC)

 

-INCDIR = $(CHIBIOS)/os/license \

-         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \

-         $(CONFDIR)

+INCDIR = $(ALLINC) $(TESTINC) $(CONFDIR)

 

 #

 # Project, sources and paths

 ##############################################################################

 

 ##############################################################################

+# Start of user section

+#

+

+# List all user C define here, like -D_DEBUG=1

+UDEFS =

+

+# Define ASM defines here

+UADEFS =

+

+# List all user directories here

+UINCDIR =

+

+# List the user directory to look for the libraries here

+ULIBDIR =

+

+# List all user libraries here

+ULIBS =

+

+#

+# End of user section

+##############################################################################

+

+##############################################################################

 # Compiler settings

 #

 

@@ -198,28 +221,5 @@ CPPWARN = -Wall -Wextra -Wundef
 # Compiler settings

 ##############################################################################

 

-##############################################################################

-# Start of user section

-#

-

-# List all user C define here, like -D_DEBUG=1

-UDEFS =

-

-# Define ASM defines here

-UADEFS =

-

-# List all user directories here

-UINCDIR =

-

-# List the user directory to look for the libraries here

-ULIBDIR =

-

-# List all user libraries here

-ULIBS =

-

-#

-# End of user defines

-##############################################################################

-

 RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC

 include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32/multi/SPI/Makefile-stm32f407_discovery b/testhal/STM32/multi/SPI/Makefile-stm32f407_discovery
index 1956d72b1..9615aa0be 100644
--- a/testhal/STM32/multi/SPI/Makefile-stm32f407_discovery
+++ b/testhal/STM32/multi/SPI/Makefile-stm32f407_discovery
@@ -74,6 +74,11 @@ 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 -fsingle-precision-constant

+endif

+

 #

 # Architecture or project specific options

 ##############################################################################

@@ -86,11 +91,13 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS = ../../../..

+CHIBIOS  := ../../../..

 CONFDIR  := ./cfg-stm32f407_discovery

 BUILDDIR := ./build-stm32f407_discovery

 DEPDIR   := ./.dep-stm32f407_discovery

 

+# Licensing files.

+include $(CHIBIOS)/os/license/license.mk

 # Startup files.

 include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk

 # HAL-OSAL files (optional).

@@ -101,6 +108,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

@@ -111,20 +120,14 @@ LDSCRIPT= $(STARTUPLD)/STM32F407xG.ld
 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

-CSRC = $(STARTUPSRC) \

-       $(KERNSRC) \

-       $(PORTSRC) \

-       $(OSALSRC) \

-       $(HALSRC) \

-       $(PLATFORMSRC) \

-       $(BOARDSRC) \

+CSRC = $(ALLCSRC) \

        $(TESTSRC) \

        $(CONFDIR)/portab.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

@@ -147,19 +150,39 @@ TCSRC =
 TCPPSRC =

 

 # List ASM source files here

-ASMSRC =

-ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)

+ASMSRC = $(ALLASMSRC)

+ASMXSRC = $(ALLXASMSRC)

 

-INCDIR = $(CHIBIOS)/os/license \

-         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \

-         $(CONFDIR)

+INCDIR = $(ALLINC) $(TESTINC) $(CONFDIR)

 

 #

 # Project, sources and paths

 ##############################################################################

 

 ##############################################################################

+# Start of user section

+#

+

+# List all user C define here, like -D_DEBUG=1

+UDEFS =

+

+# Define ASM defines here

+UADEFS =

+

+# List all user directories here

+UINCDIR =

+

+# List the user directory to look for the libraries here

+ULIBDIR =

+

+# List all user libraries here

+ULIBS =

+

+#

+# End of user section

+##############################################################################

+

+##############################################################################

 # Compiler settings

 #

 

@@ -198,28 +221,5 @@ CPPWARN = -Wall -Wextra -Wundef
 # Compiler settings

 ##############################################################################

 

-##############################################################################

-# Start of user section

-#

-

-# List all user C define here, like -D_DEBUG=1

-UDEFS =

-

-# Define ASM defines here

-UADEFS =

-

-# List all user directories here

-UINCDIR =

-

-# List the user directory to look for the libraries here

-ULIBDIR =

-

-# List all user libraries here

-ULIBS =

-

-#

-# End of user defines

-##############################################################################

-

 RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC

 include $(RULESPATH)/rules.mk