diff options
| author | Fabien Poussin <fabien.poussin@gmail.com> | 2019-10-02 16:27:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-02 16:27:12 +0200 |
| commit | 51910c3551c2a4232ba3defcef063e2f745f925a (patch) | |
| tree | 3991c377dbb51eba6292303761a847471efd9879 /os/common/startup/ARMCMx/compilers/GCC/mk/startup_nrf52.mk | |
| parent | 29cdd11f63aaf8ee856551bb6a02f3486bc756ba (diff) | |
| parent | c71108e2806c8a6f10f670c5b8642a26fa28b89c (diff) | |
| download | ChibiOS-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 'os/common/startup/ARMCMx/compilers/GCC/mk/startup_nrf52.mk')
| -rw-r--r-- | os/common/startup/ARMCMx/compilers/GCC/mk/startup_nrf52.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_nrf52.mk b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_nrf52.mk index e95f33d..338971e 100644 --- a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_nrf52.mk +++ b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_nrf52.mk @@ -5,10 +5,12 @@ STARTUPASM = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt0_v7m.S \ $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/vectors.S
STARTUPINC = $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/devices/NRF52832 \
+ $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/ld \
$(CHIBIOS)/os/common/ext/CMSIS/include \
$(CHIBIOS)/os/common/ext/ARM/CMSIS/Core/Include
-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)
|