aboutsummaryrefslogtreecommitdiffstats
path: root/os/common/startup/ARMCMx/compilers/GCC/mk/startup_k60x.mk
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 /os/common/startup/ARMCMx/compilers/GCC/mk/startup_k60x.mk
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 'os/common/startup/ARMCMx/compilers/GCC/mk/startup_k60x.mk')
-rw-r--r--os/common/startup/ARMCMx/compilers/GCC/mk/startup_k60x.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_k60x.mk b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_k60x.mk
index 9bc04c3..e7a7e57 100644
--- a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_k60x.mk
+++ b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_k60x.mk
@@ -4,12 +4,13 @@ STARTUPSRC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt1.c
STARTUPASM = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt0_v7m.S \
$(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/vectors.S
-STARTUPINC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC \
+STARTUPINC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/ld \
$(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/devices/K60x \
$(CHIBIOS)/os/common/ext/CMSIS/include \
$(CHIBIOS_CONTRIB)/os/common/ext/CMSIS/KINETIS
-STARTUPLD = $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/ld
+STARTUPLD = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/ld
+STARTUPLD_CONTRIB = $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/ld
# Shared variables
ALLXASMSRC += $(STARTUPASM)