diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-03-28 13:43:44 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-03-28 13:43:44 +0000 |
| commit | aa6af756b0f8e8ab1bb5e2fefd27fe34157acffc (patch) | |
| tree | b1ad3fcfd0c29e4e0ce1ca45979bad31cd051721 /demos/STM32/CMSIS-STM32F407-DISCOVERY | |
| parent | f215593479abba0b08e1b94794fb367d2549bab2 (diff) | |
| download | ChibiOS-aa6af756b0f8e8ab1bb5e2fefd27fe34157acffc.tar.gz ChibiOS-aa6af756b0f8e8ab1bb5e2fefd27fe34157acffc.tar.bz2 ChibiOS-aa6af756b0f8e8ab1bb5e2fefd27fe34157acffc.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7825 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'demos/STM32/CMSIS-STM32F407-DISCOVERY')
| -rw-r--r-- | demos/STM32/CMSIS-STM32F407-DISCOVERY/.cproject | 7 | ||||
| -rw-r--r-- | demos/STM32/CMSIS-STM32F407-DISCOVERY/Makefile | 26 |
2 files changed, 22 insertions, 11 deletions
diff --git a/demos/STM32/CMSIS-STM32F407-DISCOVERY/.cproject b/demos/STM32/CMSIS-STM32F407-DISCOVERY/.cproject index 914646b39..8dd00cfae 100644 --- a/demos/STM32/CMSIS-STM32F407-DISCOVERY/.cproject +++ b/demos/STM32/CMSIS-STM32F407-DISCOVERY/.cproject @@ -46,5 +46,10 @@ </scannerConfigBuildInfo>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
- <storageModule moduleId="refreshScope"/>
+ <storageModule moduleId="refreshScope" versionNumber="2">
+ <configuration configurationName="Default">
+ <resource resourceType="PROJECT" workspacePath="/CMSIS-STM32F407-DISCOVERY"/>
+ </configuration>
+ </storageModule>
+ <storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
</cproject>
diff --git a/demos/STM32/CMSIS-STM32F407-DISCOVERY/Makefile b/demos/STM32/CMSIS-STM32F407-DISCOVERY/Makefile index ffd65555d..e434dd3e4 100644 --- a/demos/STM32/CMSIS-STM32F407-DISCOVERY/Makefile +++ b/demos/STM32/CMSIS-STM32F407-DISCOVERY/Makefile @@ -81,27 +81,33 @@ PROJECT = ch # Imported source files and paths
CHIBIOS = ../../..
+# Startup files.
+include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk
+# HAL-OSAL files (optional).
include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk
include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk
+include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
+# RTOS files (optional).
include $(CHIBIOS)/os/rt/rt.mk
-include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk
-include $(CHIBIOS)/os/rt/ports/ARMCMx/cmsis_os/cmsis_os.mk
+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
+# Other files (optional).
include $(CHIBIOS)/test/rt/test.mk
+include $(CHIBIOS)/os/rt/ports/ARMCMx/cmsis_os/cmsis_os.mk
# Define linker script file here
-LDSCRIPT= $(PORTLD)/STM32F407xG.ld
+LDSCRIPT= $(STARTUPLD)/STM32F407xG.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) \
$(CMSISRTOSSRC) \
main.c
@@ -130,10 +136,10 @@ TCSRC = TCPPSRC =
# List ASM source files here
-ASMSRC = $(PORTASM)
+ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
- $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \
+INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
+ $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
$(CMSISRTOSINC) $(CHIBIOS)/os/various
#
|