aboutsummaryrefslogtreecommitdiffstats
path: root/os/common/startup/ARMCMx/compilers/GCC/mk/startup_tm4c129x.mk
diff options
context:
space:
mode:
authorDiego Ismirlian <dismirlian@gmail.com>2019-10-02 15:31:37 -0300
committerDiego Ismirlian <dismirlian@gmail.com>2019-10-02 15:31:37 -0300
commitd77e8fbd524e6c3ff67769623276419f7a8d14ba (patch)
treefd6ff77aae129045d1b1f9a5c90795fa53b7bc55 /os/common/startup/ARMCMx/compilers/GCC/mk/startup_tm4c129x.mk
parentce48812834ed2835adc80da7fa6dc463d310774e (diff)
parent2cd41f99df0fc857afaef091ca3b984a728d0e3c (diff)
downloadChibiOS-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_tm4c129x.mk')
-rw-r--r--os/common/startup/ARMCMx/compilers/GCC/mk/startup_tm4c129x.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_tm4c129x.mk b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_tm4c129x.mk
index ac4f76e..d54f194 100644
--- a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_tm4c129x.mk
+++ b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_tm4c129x.mk
@@ -5,12 +5,13 @@ STARTUPASM = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt0_v7m.S \
$(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/vectors.S
STARTUPINC = $(CHIBIOS)/os/common/portability/GCC \
- $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC \
+ $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/ld \
$(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/devices/TM4C129x \
$(CHIBIOS)/os/common/ext/ARM/CMSIS/Core/Include \
$(CHIBIOS_CONTRIB)/os/common/ext/TivaWare
-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)