diff options
| author | Fabien Poussin <fabien.poussin@gmail.com> | 2015-08-20 18:20:46 +0200 |
|---|---|---|
| committer | Fabien Poussin <fabien.poussin@gmail.com> | 2015-08-20 18:20:46 +0200 |
| commit | 586a8a2b29f1f01074a242b30198d8c638533a00 (patch) | |
| tree | 667db4c54be523c534b703597b0a4982a78d7d8c /testhal/NRF51 | |
| parent | 48a03708ff6ed34e7b0576e2c2b36587e58779d8 (diff) | |
| download | ChibiOS-Contrib-586a8a2b29f1f01074a242b30198d8c638533a00.tar.gz ChibiOS-Contrib-586a8a2b29f1f01074a242b30198d8c638533a00.tar.bz2 ChibiOS-Contrib-586a8a2b29f1f01074a242b30198d8c638533a00.zip | |
Modified makefiles to incorporate changes
Diffstat (limited to 'testhal/NRF51')
| -rw-r--r-- | testhal/NRF51/NRF51822/EXT/Makefile | 10 | ||||
| -rw-r--r-- | testhal/NRF51/NRF51822/SPI/Makefile | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/testhal/NRF51/NRF51822/EXT/Makefile b/testhal/NRF51/NRF51822/EXT/Makefile index 53b60cf..6dae021 100644 --- a/testhal/NRF51/NRF51822/EXT/Makefile +++ b/testhal/NRF51/NRF51822/EXT/Makefile @@ -80,13 +80,15 @@ endif PROJECT = ch
# Imported source files and paths
-CHIBIOS = ../../../../..
+CHIBIOS = ../../../../../ChibiOS-RT +CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib/ChibiOS-RT +CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
# Startup files.
-include $(CHIBIOS)/community/os/common/ports/ARMCMx/compilers/GCC/mk/startup_nrf51.mk
+include $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_nrf51.mk
# HAL-OSAL files (optional).
include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS)/community/os/hal/ports/NRF51/NRF51822/platform.mk
-include $(CHIBIOS)/community/os/hal/boards/WVSHARE_BLE400/board.mk
+include $(CHIBIOS_CONTRIB)/os/hal/ports/NRF51/NRF51822/platform.mk
+include $(CHIBIOS_CONTRIB)/os/hal/boards/WVSHARE_BLE400/board.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
# RTOS files (optional).
include $(CHIBIOS)/os/rt/rt.mk
diff --git a/testhal/NRF51/NRF51822/SPI/Makefile b/testhal/NRF51/NRF51822/SPI/Makefile index 013583f..6a1784f 100644 --- a/testhal/NRF51/NRF51822/SPI/Makefile +++ b/testhal/NRF51/NRF51822/SPI/Makefile @@ -80,13 +80,15 @@ endif PROJECT = ch
# Imported source files and paths
-CHIBIOS = ../../../../..
+CHIBIOS = ../../../../../ChibiOS-RT +CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib/ChibiOS-RT +CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
# Startup files.
-include $(CHIBIOS)/community/os/common/ports/ARMCMx/compilers/GCC/mk/startup_nrf51.mk
+include $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_nrf51.mk
# HAL-OSAL files (optional).
include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS)/community/os/hal/ports/NRF51/NRF51822/platform.mk
-include $(CHIBIOS)/community/os/hal/boards/WVSHARE_BLE400/board.mk
+include $(CHIBIOS_CONTRIB)/os/hal/ports/NRF51/NRF51822/platform.mk
+include $(CHIBIOS_CONTRIB)/os/hal/boards/WVSHARE_BLE400/board.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
# RTOS files (optional).
include $(CHIBIOS)/os/rt/rt.mk
|