RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

boards/thingy52: use shared Makefile.include

Browse Source
This commit is contained in:
Hauke Petersen 2018-01-05 13:14:20 +01:00
parent 12d01f97fe
commit 8d5b9edba4
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boards/common/nrf52xxxdk/Makefile.include
View File

@ -2,7 +2,7 @@
export CPU = nrf52 export CPU = nrf52
# include this module into the build # include this module into the build
ifeq (,$(filter acd52832,$(BOARD))) ifeq (,$(filter thingy52 acd52832,$(BOARD)))
INCLUDES += -I$(RIOTBOARD)/common/nrf52xxxdk/include INCLUDES += -I$(RIOTBOARD)/common/nrf52xxxdk/include
USEMODULE += boards_common_nrf52 USEMODULE += boards_common_nrf52
endif endif

9
boards/thingy52/Makefile.include
View File

@ -1,12 +1,9 @@
# CPU configuration for the Thingy:52 # CPU configuration for the Thingy:52
export CPU = nrf52
CPU_MODEL = nrf52832xxaa CPU_MODEL = nrf52832xxaa
# set default port depending on operating system # override default PORT
PORT_LINUX ?= /dev/ttyUSB0 PORT_LINUX ?= /dev/ttyUSB0
PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
include $(RIOTMAKE)/tools/serial.inc.mk
# setup JLink for flashing # use shared Makefile.include
export JLINK_DEVICE := nrf52 include $(RIOTBOARD)/common/nrf52xxxdk/Makefile.include
include $(RIOTMAKE)/tools/jlink.inc.mk