aboutsummaryrefslogtreecommitdiffstats
path: root/testhal/NRF51/NRF51822/SPI/Makefile
diff options
context:
space:
mode:
authorFabien Poussin <fabien.poussin@gmail.com>2019-10-02 16:27:12 +0200
committerGitHub <noreply@github.com>2019-10-02 16:27:12 +0200
commit51910c3551c2a4232ba3defcef063e2f745f925a (patch)
tree3991c377dbb51eba6292303761a847471efd9879 /testhal/NRF51/NRF51822/SPI/Makefile
parent29cdd11f63aaf8ee856551bb6a02f3486bc756ba (diff)
parentc71108e2806c8a6f10f670c5b8642a26fa28b89c (diff)
downloadChibiOS-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 'testhal/NRF51/NRF51822/SPI/Makefile')
-rw-r--r--testhal/NRF51/NRF51822/SPI/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/testhal/NRF51/NRF51822/SPI/Makefile b/testhal/NRF51/NRF51822/SPI/Makefile
index fa799b9..e4ebd5d 100644
--- a/testhal/NRF51/NRF51822/SPI/Makefile
+++ b/testhal/NRF51/NRF51822/SPI/Makefile
@@ -87,7 +87,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/WVSHARE_BLE400/board.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
@@ -98,7 +98,7 @@ include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v6m.mk
#include $(CHIBIOS)/test/rt/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.
@@ -203,5 +203,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