aboutsummaryrefslogtreecommitdiffstats
path: root/testhal/STM32/STM32F0xx/onewire/Makefile
diff options
context:
space:
mode:
authorDiego Ismirlian <dismirlian@gmail.com>2019-10-02 11:38:05 -0300
committerDiego Ismirlian <dismirlian@gmail.com>2019-10-02 11:38:05 -0300
commit6f817a029807c07668d41b33faa3512df129710a (patch)
tree9502da2e070e245b51af4ed51b8c681fe13df416 /testhal/STM32/STM32F0xx/onewire/Makefile
parentd685cfd0c27252b77fe3cb5416d3921f37033e81 (diff)
parent51910c3551c2a4232ba3defcef063e2f745f925a (diff)
downloadChibiOS-Contrib-6f817a029807c07668d41b33faa3512df129710a.tar.gz
ChibiOS-Contrib-6f817a029807c07668d41b33faa3512df129710a.tar.bz2
ChibiOS-Contrib-6f817a029807c07668d41b33faa3512df129710a.zip
Merge branch 'master' of https://github.com/ChibiOS/ChibiOS-Contrib
Diffstat (limited to 'testhal/STM32/STM32F0xx/onewire/Makefile')
-rw-r--r--testhal/STM32/STM32F0xx/onewire/Makefile18
1 files changed, 10 insertions, 8 deletions
diff --git a/testhal/STM32/STM32F0xx/onewire/Makefile b/testhal/STM32/STM32F0xx/onewire/Makefile
index c598f7f..77bee43 100644
--- a/testhal/STM32/STM32F0xx/onewire/Makefile
+++ b/testhal/STM32/STM32F0xx/onewire/Makefile
@@ -84,6 +84,7 @@ PROJECT = ch
CHIBIOS = ../../../../../ChibiOS
CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
TESTHAL = $(CHIBIOS_CONTRIB)/testhal/common/onewire
+
# Licensing files.
include $(CHIBIOS)/os/license/license.mk
# Startup files.
@@ -97,9 +98,11 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v6m.mk
# Other files (optional).
-#include $(CHIBIOS)/test/lib/test.mk
-#include $(CHIBIOS)/test/rt/rt_test.mk
-#include $(CHIBIOS)/test/oslib/oslib_test.mk
+include $(CHIBIOS)/test/lib/test.mk
+include $(CHIBIOS)/test/rt/rt_test.mk
+include $(CHIBIOS)/test/oslib/oslib_test.mk
+include $(CHIBIOS)/os/hal/lib/streams/streams.mk
+include $(CHIBIOS)/os/various/shell/shell.mk
# Define linker script file here
LDSCRIPT= $(STARTUPLD)/STM32F051x8.ld
@@ -108,8 +111,8 @@ LDSCRIPT= $(STARTUPLD)/STM32F051x8.ld
# setting.
CSRC = $(ALLCSRC) \
$(TESTSRC) \
- main.c \
- $(TESTHAL)/testhal_onewire.c
+ $(TESTHAL)/testhal_onewire.c \
+ main.c
# C++ sources that can be compiled in ARM or THUMB mode depending on the global
# setting.
@@ -139,8 +142,7 @@ TCPPSRC =
ASMSRC = $(ALLASMSRC)
ASMXSRC = $(ALLXASMSRC)
-INCDIR = $(ALLINC) $(TESTINC) \
- $(TESTHAL)
+INCDIR = $(ALLINC) $(TESTINC) $(TESTHAL)
#
# Project, sources and paths
@@ -208,5 +210,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk