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

2 files changed, 45 insertions, 154 deletions

diff --git a/demos/STM32/NIL-STM32L152-DISCOVERY/.cproject b/demos/STM32/NIL-STM32L152-DISCOVERY/.cproject
index d13cd471f..53f0ef742 100644
--- a/demos/STM32/NIL-STM32L152-DISCOVERY/.cproject
+++ b/demos/STM32/NIL-STM32L152-DISCOVERY/.cproject
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<?fileVersion 4.0.0?>

-

-<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">

+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">

 	<storageModule moduleId="org.eclipse.cdt.core.settings">

-		<cconfiguration id="0.87736009">

-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.87736009" moduleId="org.eclipse.cdt.core.settings" name="Default">

+		<cconfiguration id="0.114656749">

+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.114656749" moduleId="org.eclipse.cdt.core.settings" name="Default">

 				<externalSettings/>

 				<extensions>

-					<extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>

 					<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

 					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

 					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>

@@ -17,20 +14,20 @@
 				</extensions>

 			</storageModule>

 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">

-				<configuration artifactName="${ProjName}" buildProperties="" description="" id="0.87736009" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">

-					<folderInfo id="0.87736009." name="/" resourcePath="">

-						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1294118206" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">

-							<targetPlatform binaryParser="org.eclipse.cdt.core.GNU_ELF" id="org.eclipse.cdt.build.core.prefbase.toolchain.1294118206.805393367" name=""/>

-							<builder command="mingw32-make" id="org.eclipse.cdt.build.core.settings.default.builder.744360857" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.686764108" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.1629275092" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">

-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.760786311" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

+				<configuration artifactName="${ProjName}" buildProperties="" description="" id="0.114656749" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">

+					<folderInfo id="0.114656749." name="/" resourcePath="">

+						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1182750861" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">

+							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.1182750861.169007201" name=""/>

+							<builder autoBuildTarget="all" cleanBuildTarget="clean" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="org.eclipse.cdt.build.core.settings.default.builder.579570726" incrementalBuildTarget="all" 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.2143276802" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.1873650595" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1337802279" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

 							</tool>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.1369722403" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">

-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1713969351" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.1707090075" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.338985256" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

 							</tool>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.883301168" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">

-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1732469280" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.1165165914" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.714476670" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

 							</tool>

 						</toolChain>

 					</folderInfo>

@@ -40,134 +37,18 @@
 		</cconfiguration>

 	</storageModule>

 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">

-		<project id="Nil.null.181931990" name="Nil"/>

+		<project id="NIL-STM32L152-DISCOVERY.null.1703860681" name="NIL-STM32L152-DISCOVERY"/>

 	</storageModule>

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

-	<storageModule moduleId="refreshScope"/>

 	<storageModule moduleId="scannerConfiguration">

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

-		<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">

-			<buildOutputProvider>

-				<openAction enabled="true" filePath=""/>

-				<parser enabled="true"/>

-			</buildOutputProvider>

-			<scannerInfoProvider id="specsFile">

-				<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>

-				<parser enabled="true"/>

-			</scannerInfoProvider>

-		</profile>

-		<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">

-			<buildOutputProvider>

-				<openAction enabled="true" filePath=""/>

-				<parser enabled="true"/>

-			</buildOutputProvider>

-			<scannerInfoProvider id="specsFile">

-				<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>

-				<parser enabled="true"/>

-			</scannerInfoProvider>

-		</profile>

-		<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">

-			<buildOutputProvider>

-				<openAction enabled="true" filePath=""/>

-				<parser enabled="true"/>

-			</buildOutputProvider>

-			<scannerInfoProvider id="specsFile">

-				<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>

-				<parser enabled="true"/>

-			</scannerInfoProvider>

-		</profile>

-		<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">

-			<buildOutputProvider>

-				<openAction enabled="true" filePath=""/>

-				<parser enabled="true"/>

-			</buildOutputProvider>

-			<scannerInfoProvider id="specsFile">

-				<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>

-				<parser enabled="true"/>

-			</scannerInfoProvider>

-		</profile>

-		<scannerConfigBuildInfo instanceId="0.87736009">

+		<scannerConfigBuildInfo instanceId="0.114656749">

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

-			<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">

-				<buildOutputProvider>

-					<openAction enabled="true" filePath=""/>

-					<parser enabled="true"/>

-				</buildOutputProvider>

-				<scannerInfoProvider id="specsFile">

-					<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>

-					<parser enabled="true"/>

-				</scannerInfoProvider>

-			</profile>

-			<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">

-				<buildOutputProvider>

-					<openAction enabled="true" filePath=""/>

-					<parser enabled="true"/>

-				</buildOutputProvider>

-				<scannerInfoProvider id="makefileGenerator">

-					<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>

-					<parser enabled="true"/>

-				</scannerInfoProvider>

-			</profile>

-			<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">

-				<buildOutputProvider>

-					<openAction enabled="true" filePath=""/>

-					<parser enabled="true"/>

-				</buildOutputProvider>

-				<scannerInfoProvider id="specsFile">

-					<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>

-					<parser enabled="true"/>

-				</scannerInfoProvider>

-			</profile>

-			<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">

-				<buildOutputProvider>

-					<openAction enabled="true" filePath=""/>

-					<parser enabled="true"/>

-				</buildOutputProvider>

-				<scannerInfoProvider id="specsFile">

-					<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>

-					<parser enabled="true"/>

-				</scannerInfoProvider>

-			</profile>

-			<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">

-				<buildOutputProvider>

-					<openAction enabled="true" filePath=""/>

-					<parser enabled="true"/>

-				</buildOutputProvider>

-				<scannerInfoProvider id="specsFile">

-					<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>

-					<parser enabled="true"/>

-				</scannerInfoProvider>

-			</profile>

-			<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">

-				<buildOutputProvider>

-					<openAction enabled="true" filePath=""/>

-					<parser enabled="true"/>

-				</buildOutputProvider>

-				<scannerInfoProvider id="specsFile">

-					<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>

-					<parser enabled="true"/>

-				</scannerInfoProvider>

-			</profile>

-			<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">

-				<buildOutputProvider>

-					<openAction enabled="true" filePath=""/>

-					<parser enabled="true"/>

-				</buildOutputProvider>

-				<scannerInfoProvider id="specsFile">

-					<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>

-					<parser enabled="true"/>

-				</scannerInfoProvider>

-			</profile>

-			<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">

-				<buildOutputProvider>

-					<openAction enabled="true" filePath=""/>

-					<parser enabled="true"/>

-				</buildOutputProvider>

-				<scannerInfoProvider id="specsFile">

-					<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>

-					<parser enabled="true"/>

-				</scannerInfoProvider>

-			</profile>

 		</scannerConfigBuildInfo>

 	</storageModule>

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

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

+		<configuration configurationName="Default">

+			<resource resourceType="PROJECT" workspacePath="/NIL-STM32L152-DISCOVERY"/>

+		</configuration>

+	</storageModule>

 </cproject>

diff --git a/demos/STM32/NIL-STM32L152-DISCOVERY/Makefile b/demos/STM32/NIL-STM32L152-DISCOVERY/Makefile
index 9384ced4d..2aa4cc943 100644
--- a/demos/STM32/NIL-STM32L152-DISCOVERY/Makefile
+++ b/demos/STM32/NIL-STM32L152-DISCOVERY/Makefile
@@ -63,6 +63,11 @@ ifeq ($(USE_EXCEPTIONS_STACKSIZE),)
   USE_EXCEPTIONS_STACKSIZE = 0x400

 endif

 

+# Enables the use of FPU on Cortex-M4 (no, softfp, hard).

+ifeq ($(USE_FPU),)

+  USE_FPU = no

+endif

+

 #

 # Architecture or project specific options

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

@@ -76,26 +81,32 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

+# Startup files.

+include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_stm32l1xx.mk

+# HAL-OSAL files (optional).

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/hal/boards/ST_STM32L_DISCOVERY/board.mk

 include $(CHIBIOS)/os/hal/ports/STM32/STM32L1xx/platform.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32L_DISCOVERY/board.mk

 include $(CHIBIOS)/os/hal/osal/nil/osal.mk

+# RTOS files (optional).

 include $(CHIBIOS)/os/nil/nil.mk

-include $(CHIBIOS)/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32l1xx.mk

-#include $(CHIBIOS)/test/rt/test.mk

+include $(CHIBIOS)/os/nil/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk

+# Other files (optional).

+#include $(CHIBIOS)/test/nil/test.mk

 

 # Define linker script file here

-LDSCRIPT= $(PORTLD)/STM32L152xB.ld

+LDSCRIPT= $(STARTUPLD)/STM32L152xB.ld

 

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

 # setting.

-CSRC = $(PORTSRC) \

+CSRC = $(STARTUPSRC) \

        $(KERNSRC) \

-       $(TESTSRC) \

-       $(HALSRC) \

+       $(PORTSRC) \

        $(OSALSRC) \

+       $(HALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

+       $(TESTSRC) \

        main.c

 

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

@@ -123,11 +134,10 @@ TCSRC =
 TCPPSRC =

 

 # List ASM source files here

-ASMSRC = $(PORTASM)

+ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)

 

-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

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

-         $(CHIBIOS)/os/various/devices_lib/accel \

+INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \

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

          $(CHIBIOS)/os/various

 

 #

@@ -138,7 +148,7 @@ INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
 # Compiler settings

 #

 

-MCU  = cortex-m3

+MCU  = cortex-m4

 

 #TRGT = arm-elf-

 TRGT = arm-none-eabi-