aboutsummaryrefslogtreecommitdiffstats
path: root/testhal/KINETIS/TEENSY3_x/PWM/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/KINETIS/TEENSY3_x/PWM/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/KINETIS/TEENSY3_x/PWM/Makefile')
-rw-r--r--testhal/KINETIS/TEENSY3_x/PWM/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/testhal/KINETIS/TEENSY3_x/PWM/Makefile b/testhal/KINETIS/TEENSY3_x/PWM/Makefile
index eee81be..675591d 100644
--- a/testhal/KINETIS/TEENSY3_x/PWM/Makefile
+++ b/testhal/KINETIS/TEENSY3_x/PWM/Makefile
@@ -93,7 +93,7 @@ include $(CHIBIOS)/os/license/license.mk
# Startup files.
include $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_k20x7.mk
# HAL-OSAL files (optional).
-include $(CHIBIOS)/os/hal/hal.mk
+include $(CHIBIOS_CONTRIB)/os/hal/hal.mk
include $(CHIBIOS_CONTRIB)/os/hal/ports/KINETIS/K20x/platform.mk
include $(CHIBIOS_CONTRIB)/os/hal/boards/PJRC_TEENSY_3_1/board.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
@@ -103,7 +103,7 @@ include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
# Other files (optional).
# Define linker script file here
-LDSCRIPT= $(STARTUPLD)/MK20DX256.ld
+LDSCRIPT= $(STARTUPLD_CONTRIB)/MK20DX256.ld
# C sources that can be compiled in ARM or THUMB mode depending on the global
# setting.
@@ -209,5 +209,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