From aa91fa657699d253a915fc392e4e8af9e54c6c93 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sat, 9 Apr 2016 12:17:08 +0000 Subject: [PATCH] git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9261 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/Makefile | 8 +++++--- demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/Makefile | 3 ++- .../nasa_cfe/cfe_osal/{nasa_osal.mk => cfe_osal.mk} | 0 os/common/abstractions/nasa_cfe/cfe_psp/cfe_psp.mk | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-) rename os/common/abstractions/nasa_cfe/cfe_osal/{nasa_osal.mk => cfe_osal.mk} (100%) 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 diff --git a/os/common/abstractions/nasa_cfe/cfe_osal/nasa_osal.mk b/os/common/abstractions/nasa_cfe/cfe_osal/cfe_osal.mk similarity index 100% rename from os/common/abstractions/nasa_cfe/cfe_osal/nasa_osal.mk rename to os/common/abstractions/nasa_cfe/cfe_osal/cfe_osal.mk diff --git a/os/common/abstractions/nasa_cfe/cfe_psp/cfe_psp.mk b/os/common/abstractions/nasa_cfe/cfe_psp/cfe_psp.mk index 510afcfcd..3e1d34345 100644 --- a/os/common/abstractions/nasa_cfe/cfe_psp/cfe_psp.mk +++ b/os/common/abstractions/nasa_cfe/cfe_psp/cfe_psp.mk @@ -1,4 +1,4 @@ # NASA CFE PSP files. -CFEOSALSRC = $(CHIBIOS)/os/common/abstractions/nasa_cfe/cfe_psp/src/cfe_psp_support.c +CFEPSPSRC = $(CHIBIOS)/os/common/abstractions/nasa_cfe/cfe_psp/src/cfe_psp_support.c -CFEOSALINC = $(CHIBIOS)/os/common/abstractions/nasa_cfe/cfe_psp/include +CFEPSPINC = $(CHIBIOS)/os/common/abstractions/nasa_cfe/cfe_psp/include