aboutsummaryrefslogtreecommitdiffstats
path: root/demos/NRF52/Classic/Makefile
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 /demos/NRF52/Classic/Makefile
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 'demos/NRF52/Classic/Makefile')
-rw-r--r--demos/NRF52/Classic/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/demos/NRF52/Classic/Makefile b/demos/NRF52/Classic/Makefile
index 5cfc011..7511551 100644
--- a/demos/NRF52/Classic/Makefile
+++ b/demos/NRF52/Classic/Makefile
@@ -108,7 +108,7 @@ include $(CHIBIOS)/test/oslib/oslib_test.mk
include $(CHIBIOS)/os/various/shell/shell.mk
# Define linker script file here
-LDSCRIPT= $(STARTUPLD)/NRF52832.ld
+LDSCRIPT= $(STARTUPLD_CONTRIB)/NRF52832.ld
# C sources that can be compiled in ARM or THUMB mode depending on the global
# setting.
@@ -213,7 +213,7 @@ 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
OHEX = $(BUILDDIR)/$(PROJECT).hex