diff options
| author | Diego Ismirlian <dismirlian@gmail.com> | 2019-10-02 11:38:05 -0300 |
|---|---|---|
| committer | Diego Ismirlian <dismirlian@gmail.com> | 2019-10-02 11:38:05 -0300 |
| commit | 6f817a029807c07668d41b33faa3512df129710a (patch) | |
| tree | 9502da2e070e245b51af4ed51b8c681fe13df416 /demos/NRF51/OSHCHIP_V1.0/Makefile | |
| parent | d685cfd0c27252b77fe3cb5416d3921f37033e81 (diff) | |
| parent | 51910c3551c2a4232ba3defcef063e2f745f925a (diff) | |
| download | ChibiOS-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/NRF51/OSHCHIP_V1.0/Makefile')
| -rw-r--r-- | demos/NRF51/OSHCHIP_V1.0/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/demos/NRF51/OSHCHIP_V1.0/Makefile b/demos/NRF51/OSHCHIP_V1.0/Makefile index 554a7da..cd15d62 100644 --- a/demos/NRF51/OSHCHIP_V1.0/Makefile +++ b/demos/NRF51/OSHCHIP_V1.0/Makefile @@ -93,7 +93,7 @@ include $(CHIBIOS)/os/license/license.mk # Startup files.
include $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_nrf51.mk
# HAL-OSAL files (optional).
-include $(CHIBIOS)/os/hal/hal.mk
+include $(CHIBIOS_CONTRIB)/os/hal/hal.mk
include $(CHIBIOS_CONTRIB)/os/hal/ports/NRF5/NRF51822/platform.mk
include $(CHIBIOS_CONTRIB)/os/hal/boards/OSHCHIP_V1.0/board.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
@@ -106,7 +106,7 @@ include $(CHIBIOS)/test/rt/rt_test.mk include $(CHIBIOS)/test/oslib/oslib_test.mk
# Define linker script file here
-LDSCRIPT= $(STARTUPLD)/NRF51822.ld
+LDSCRIPT= $(STARTUPLD_CONTRIB)/NRF51822.ld
# C sources that can be compiled in ARM or THUMB mode depending on the global
# setting.
@@ -211,5 +211,5 @@ 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
|