diff options
| author | Fabio Utzig <utzig@utzig.org> | 2015-05-12 22:04:43 -0300 |
|---|---|---|
| committer | Fabio Utzig <utzig@utzig.org> | 2015-05-12 22:04:43 -0300 |
| commit | 07f508a514e913a67e277292103e9a311d3dcd5e (patch) | |
| tree | d0a0c17bfe72446e92b68cdfab37f13bbb7482d4 /demos/NRF51 | |
| parent | a0110bc1798b22a9e2e86ebf8a950d0910e24ceb (diff) | |
| download | ChibiOS-Contrib-07f508a514e913a67e277292103e9a311d3dcd5e.tar.gz ChibiOS-Contrib-07f508a514e913a67e277292103e9a311d3dcd5e.tar.bz2 ChibiOS-Contrib-07f508a514e913a67e277292103e9a311d3dcd5e.zip | |
Fix paths and MCU
Diffstat (limited to 'demos/NRF51')
| -rw-r--r-- | demos/NRF51/RT-WVSHARE_BLE400/Makefile | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/demos/NRF51/RT-WVSHARE_BLE400/Makefile b/demos/NRF51/RT-WVSHARE_BLE400/Makefile index 60dffd5..95eaa8e 100644 --- a/demos/NRF51/RT-WVSHARE_BLE400/Makefile +++ b/demos/NRF51/RT-WVSHARE_BLE400/Makefile @@ -25,7 +25,7 @@ endif # Linker extra options here.
ifeq ($(USE_LDOPT),)
- USE_LDOPT =
+ USE_LDOPT =
endif
# Enable this if you want link time optimizations (LTO)
@@ -80,19 +80,19 @@ endif PROJECT = ch
# Imported source files and paths
-CHIBIOS = ../../..
+CHIBIOS = ../../../..
# Startup files.
-include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_nrf51.mk
+include $(CHIBIOS)/community/os/common/ports/ARMCMx/compilers/GCC/mk/startup_nrf51.mk
# HAL-OSAL files (optional).
include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS)/os/hal/ports/NRF51/NRF51822/platform.mk
-include $(CHIBIOS)/os/hal/boards/WVSHARE_BLE400/board.mk
+include $(CHIBIOS)/community/os/hal/ports/NRF51/NRF51822/platform.mk
+include $(CHIBIOS)/community/os/hal/boards/WVSHARE_BLE400/board.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
# RTOS files (optional).
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_v6m.mk
# Other files (optional).
-include $(CHIBIOS)/test/rt/test.mk
+#include $(CHIBIOS)/test/rt/test.mk
# Define linker script file here
LDSCRIPT= $(STARTUPLD)/NRF51822.ld
@@ -106,7 +106,6 @@ CSRC = $(STARTUPSRC) \ $(HALSRC) \
$(PLATFORMSRC) \
$(BOARDSRC) \
- $(TESTSRC) \
main.c
# C++ sources that can be compiled in ARM or THUMB mode depending on the global
@@ -148,9 +147,8 @@ INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \ # Compiler settings
#
-MCU = cortex-m4
+MCU = cortex-m0
-#TRGT = arm-elf-
TRGT = arm-none-eabi-
CC = $(TRGT)gcc
CPPC = $(TRGT)g++
|