From 586a8a2b29f1f01074a242b30198d8c638533a00 Mon Sep 17 00:00:00 2001 From: Fabien Poussin Date: Thu, 20 Aug 2015 18:20:46 +0200 Subject: Modified makefiles to incorporate changes --- testhal/NRF51/NRF51822/EXT/Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'testhal/NRF51/NRF51822/EXT/Makefile') 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 -- cgit v1.2.3