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 /demos/NRF52/Classic/Makefile | |
| 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 'demos/NRF52/Classic/Makefile')
| -rw-r--r-- | demos/NRF52/Classic/Makefile | 4 |
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
|