diff options
| author | Fabio Utzig <utzig@utzig.org> | 2016-07-08 12:21:58 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-08 12:21:58 -0300 |
| commit | 8306aabdfc13302edfa81c55a774ed7daefdc9c4 (patch) | |
| tree | dd3a6ed731b7da2ab8ea4d3657d2c2faa8c53a96 /demos | |
| parent | 0375554e956f96453e9381bf01bbe092ae218359 (diff) | |
| parent | c519f273db49a2a726cfb6babb6b30c08cb47220 (diff) | |
| download | ChibiOS-Contrib-8306aabdfc13302edfa81c55a774ed7daefdc9c4.tar.gz ChibiOS-Contrib-8306aabdfc13302edfa81c55a774ed7daefdc9c4.tar.bz2 ChibiOS-Contrib-8306aabdfc13302edfa81c55a774ed7daefdc9c4.zip | |
Merge pull request #89 from sdalu/nrf5
Making room for NRF52832
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/NRF51/OSHCHIP_V1.0/Makefile | 2 | ||||
| -rw-r--r-- | demos/NRF51/RT-WVSHARE_BLE400/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/demos/NRF51/OSHCHIP_V1.0/Makefile b/demos/NRF51/OSHCHIP_V1.0/Makefile index 6333de9..32ec1d8 100644 --- a/demos/NRF51/OSHCHIP_V1.0/Makefile +++ b/demos/NRF51/OSHCHIP_V1.0/Makefile @@ -92,7 +92,7 @@ CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib 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/ports/NRF51/NRF51822/platform.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
# RTOS files (optional).
diff --git a/demos/NRF51/RT-WVSHARE_BLE400/Makefile b/demos/NRF51/RT-WVSHARE_BLE400/Makefile index d9d0e95..cb1ee35 100644 --- a/demos/NRF51/RT-WVSHARE_BLE400/Makefile +++ b/demos/NRF51/RT-WVSHARE_BLE400/Makefile @@ -92,7 +92,7 @@ CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib 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/ports/NRF51/NRF51822/platform.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
# RTOS files (optional).
|