diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-03-28 09:12:09 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-03-28 09:12:09 +0000 |
| commit | 4cd975affe635e7e635a76eafd2b0f9b4b747e07 (patch) | |
| tree | 03c899a1876ca8b058e8ba1fa5c43f60e8645886 /demos/STM32/RT-STM32F411RE-NUCLEO | |
| parent | 746736f9ca4f97a0dd60eeb4b3d0da6ef178f98c (diff) | |
| download | ChibiOS-4cd975affe635e7e635a76eafd2b0f9b4b747e07.tar.gz ChibiOS-4cd975affe635e7e635a76eafd2b0f9b4b747e07.tar.bz2 ChibiOS-4cd975affe635e7e635a76eafd2b0f9b4b747e07.zip | |
Improved makefiles on STM32F4xx.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7823 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'demos/STM32/RT-STM32F411RE-NUCLEO')
| -rw-r--r-- | demos/STM32/RT-STM32F411RE-NUCLEO/.cproject | 4 | ||||
| -rw-r--r-- | demos/STM32/RT-STM32F411RE-NUCLEO/Makefile | 24 |
2 files changed, 16 insertions, 12 deletions
diff --git a/demos/STM32/RT-STM32F411RE-NUCLEO/.cproject b/demos/STM32/RT-STM32F411RE-NUCLEO/.cproject index 209060fd4..f0beab8d0 100644 --- a/demos/STM32/RT-STM32F411RE-NUCLEO/.cproject +++ b/demos/STM32/RT-STM32F411RE-NUCLEO/.cproject @@ -1,7 +1,5 @@ <?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.603687198">
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.603687198" moduleId="org.eclipse.cdt.core.settings" name="Default">
diff --git a/demos/STM32/RT-STM32F411RE-NUCLEO/Makefile b/demos/STM32/RT-STM32F411RE-NUCLEO/Makefile index 1681fc58c..f47158d83 100644 --- a/demos/STM32/RT-STM32F411RE-NUCLEO/Makefile +++ b/demos/STM32/RT-STM32F411RE-NUCLEO/Makefile @@ -81,26 +81,32 @@ 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_NUCLEO_F411RE/board.mk
include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk
+include $(CHIBIOS)/os/hal/boards/ST_NUCLEO_F411RE/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/compilers/GCC/mk/port_v7m.mk
+# Other files (optional).
include $(CHIBIOS)/test/rt/test.mk
# Define linker script file here
-LDSCRIPT= $(PORTLD)/STM32F411xE.ld
+LDSCRIPT= $(STARTUPLD)/STM32F411xE.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
@@ -128,10 +134,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) \
$(CHIBIOS)/os/various
#
|