diff options
| author | Fabien Poussin <fabien.poussin@gmail.com> | 2018-03-15 12:51:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-15 12:51:14 +0100 |
| commit | 3add406135c78d44ebc38d810b22af5da19cd296 (patch) | |
| tree | fd42297388ca04dc8ff202e40d491b73ff4c21d6 /testhal/STM32/STM32F3xx/EEProm/Makefile | |
| parent | 345e218afd4f8009729dddc6eb541d8ec6a91565 (diff) | |
| parent | dabdfca04e5f470d1eb83f72f18269bd294031b6 (diff) | |
| download | ChibiOS-Contrib-3add406135c78d44ebc38d810b22af5da19cd296.tar.gz ChibiOS-Contrib-3add406135c78d44ebc38d810b22af5da19cd296.tar.bz2 ChibiOS-Contrib-3add406135c78d44ebc38d810b22af5da19cd296.zip | |
Merge branch 'master' into update_tests
Diffstat (limited to 'testhal/STM32/STM32F3xx/EEProm/Makefile')
| -rw-r--r-- | testhal/STM32/STM32F3xx/EEProm/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/testhal/STM32/STM32F3xx/EEProm/Makefile b/testhal/STM32/STM32F3xx/EEProm/Makefile index bd22f9f..0e3d04d 100644 --- a/testhal/STM32/STM32F3xx/EEProm/Makefile +++ b/testhal/STM32/STM32F3xx/EEProm/Makefile @@ -10,7 +10,7 @@ endif # C specific options here (added to USE_OPT).
ifeq ($(USE_COPT),)
- USE_COPT =
+ USE_COPT =
endif
# C++ specific options here (added to USE_OPT).
@@ -99,7 +99,9 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
# Other files (optional).
+#include $(CHIBIOS)/test/lib/test.mk
#include $(CHIBIOS)/test/rt/rt_test.mk
+#include $(CHIBIOS)/test/oslib/oslib_test.mk
# Define linker script file here
LDSCRIPT= $(STARTUPLD)/STM32F303xC.ld
@@ -147,7 +149,7 @@ ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM) INCDIR = $(CHIBIOS)/os/license \
$(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
$(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
- $(CHIBIOS)/os/various
+ $(CHIBIOS_CONTRIB)/os/various
#
# Project, sources and paths
|