diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-04-09 12:17:08 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-04-09 12:17:08 +0000 |
| commit | aa91fa657699d253a915fc392e4e8af9e54c6c93 (patch) | |
| tree | 519567ad31a3816fb1e02ddfa39fdb492fed32b1 /demos/STM32 | |
| parent | 44409cf305fb4a1ce770edc0d8792c88fcd28df4 (diff) | |
| download | ChibiOS-aa91fa657699d253a915fc392e4e8af9e54c6c93.tar.gz ChibiOS-aa91fa657699d253a915fc392e4e8af9e54c6c93.tar.bz2 ChibiOS-aa91fa657699d253a915fc392e4e8af9e54c6c93.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9261 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'demos/STM32')
| -rw-r--r-- | demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/Makefile | 8 | ||||
| -rw-r--r-- | demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/Makefile | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/Makefile b/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/Makefile index 8a4a876f1..730d004cc 100644 --- a/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/Makefile +++ b/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/Makefile @@ -99,7 +99,8 @@ include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
# Other files (optional).
include $(CHIBIOS)/test/nasa_osal/test.mk
-include $(CHIBIOS)/os/common/abstractions/nasa_osal/nasa_osal.mk
+include $(CHIBIOS)/os/common/abstractions/nasa_cfe/cfe_osal/cfe_osal.mk
+include $(CHIBIOS)/os/common/abstractions/nasa_cfe/cfe_psp/cfe_psp.mk
# Define linker script file here
LDSCRIPT= $(STARTUPLD)/STM32F407xG.ld
@@ -114,7 +115,8 @@ CSRC = $(STARTUPSRC) \ $(PLATFORMSRC) \
$(BOARDSRC) \
$(TESTSRC) \
- $(NASAOSALSRC) \
+ $(CFEOSALSRC) \
+ $(CFEPSPSRC) \
main.c
# C++ sources that can be compiled in ARM or THUMB mode depending on the global
@@ -146,7 +148,7 @@ ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM) INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
$(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
- $(NASAOSALINC)
+ $(CFEOSALINC) $(CFEPSPINC)
#
# Project, sources and paths
diff --git a/demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/Makefile b/demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/Makefile index 9bc384f7b..60a421262 100644 --- a/demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/Makefile +++ b/demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/Makefile @@ -99,7 +99,8 @@ include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
# Other files (optional).
include $(CHIBIOS)/test/nasa_osal/test.mk
-include $(CHIBIOS)/os/common/abstractions/nasa_osal/nasa_osal.mk
+include $(CHIBIOS)/os/common/abstractions/nasa_cfe/cfe_osal/cfe_osal.mk
+include $(CHIBIOS)/os/common/abstractions/nasa_cfe/cfe_psp/cfe_psp.mk
# Define linker script file here
LDSCRIPT= $(STARTUPLD)/STM32F746xG.ld
|