diff options
author | Diego Ismirlian <dismirlian@gmail.com> | 2019-10-02 15:31:37 -0300 |
---|---|---|
committer | Diego Ismirlian <dismirlian@gmail.com> | 2019-10-02 15:31:37 -0300 |
commit | d77e8fbd524e6c3ff67769623276419f7a8d14ba (patch) | |
tree | fd6ff77aae129045d1b1f9a5c90795fa53b7bc55 /testhal/STM32/STM32F1xx/qei/Makefile | |
parent | ce48812834ed2835adc80da7fa6dc463d310774e (diff) | |
parent | 2cd41f99df0fc857afaef091ca3b984a728d0e3c (diff) | |
download | ChibiOS-Contrib-d77e8fbd524e6c3ff67769623276419f7a8d14ba.tar.gz ChibiOS-Contrib-d77e8fbd524e6c3ff67769623276419f7a8d14ba.tar.bz2 ChibiOS-Contrib-d77e8fbd524e6c3ff67769623276419f7a8d14ba.zip |
Merge branch 'master' into segger_systemview
Diffstat (limited to 'testhal/STM32/STM32F1xx/qei/Makefile')
-rw-r--r-- | testhal/STM32/STM32F1xx/qei/Makefile | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/testhal/STM32/STM32F1xx/qei/Makefile b/testhal/STM32/STM32F1xx/qei/Makefile index ff058da..47cc893 100644 --- a/testhal/STM32/STM32F1xx/qei/Makefile +++ b/testhal/STM32/STM32F1xx/qei/Makefile @@ -88,6 +88,7 @@ PROJECT = ch # Imported source files and paths CHIBIOS = ../../../../../ChibiOS CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib + # Licensing files. include $(CHIBIOS)/os/license/license.mk # Startup files. @@ -101,9 +102,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_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 +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)/STM32F103xB.ld @@ -210,5 +213,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 |