aboutsummaryrefslogtreecommitdiffstats
path: root/testhal/KINETIS/TEENSY_LC/BOOTLOADER/Makefile
diff options
context:
space:
mode:
authorFabien Poussin <fabien.poussin@gmail.com>2019-10-02 16:27:12 +0200
committerGitHub <noreply@github.com>2019-10-02 16:27:12 +0200
commit51910c3551c2a4232ba3defcef063e2f745f925a (patch)
tree3991c377dbb51eba6292303761a847471efd9879 /testhal/KINETIS/TEENSY_LC/BOOTLOADER/Makefile
parent29cdd11f63aaf8ee856551bb6a02f3486bc756ba (diff)
parentc71108e2806c8a6f10f670c5b8642a26fa28b89c (diff)
downloadChibiOS-Contrib-51910c3551c2a4232ba3defcef063e2f745f925a.tar.gz
ChibiOS-Contrib-51910c3551c2a4232ba3defcef063e2f745f925a.tar.bz2
ChibiOS-Contrib-51910c3551c2a4232ba3defcef063e2f745f925a.zip
Merge pull request #197 from ChibiOS/fixes-19.1
Updates for 19.1.x compatibliity
Diffstat (limited to 'testhal/KINETIS/TEENSY_LC/BOOTLOADER/Makefile')
-rw-r--r--testhal/KINETIS/TEENSY_LC/BOOTLOADER/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/testhal/KINETIS/TEENSY_LC/BOOTLOADER/Makefile b/testhal/KINETIS/TEENSY_LC/BOOTLOADER/Makefile
index ba07396..c9c6829 100644
--- a/testhal/KINETIS/TEENSY_LC/BOOTLOADER/Makefile
+++ b/testhal/KINETIS/TEENSY_LC/BOOTLOADER/Makefile
@@ -93,7 +93,7 @@ include $(CHIBIOS)/os/license/license.mk
# Startup files.
include $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_kl2x.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/KL2x/platform.mk
include $(CHIBIOS_CONTRIB)/os/hal/boards/PJRC_TEENSY_LC/board.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
@@ -103,7 +103,7 @@ include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v6m.mk
# Other files (optional).
# Define linker script file here
-LDSCRIPT= $(STARTUPLD)/MKL26Z64.ld
+LDSCRIPT= $(STARTUPLD_CONTRIB)/MKL26Z64.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