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 /os/common/startup/ARMCMx/compilers/GCC/mk/startup_k20x.mk | |
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 'os/common/startup/ARMCMx/compilers/GCC/mk/startup_k20x.mk')
-rw-r--r-- | os/common/startup/ARMCMx/compilers/GCC/mk/startup_k20x.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_k20x.mk b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_k20x.mk index f01bd22..50426b4 100644 --- a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_k20x.mk +++ b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_k20x.mk @@ -4,10 +4,11 @@ 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/K20x \
$(CHIBIOS)/os/common/ext/CMSIS/include \
$(CHIBIOS)/os/common/ext/ARM/CMSIS/Core/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
|