Skip to content

Commit

Permalink
boards/nrf6310: move CPU/CPU_MODEL definition to Makefile.features
Browse files Browse the repository at this point in the history
cpu/$(CPU)/Makefile.features and cpu/$(CPU)/Makefile.dep are
automatically included

Part of moving CPU/CPU_MODEL definition to Makefile.features to have it
available before Makefile.include.
  • Loading branch information
cladmi committed Sep 24, 2019
1 parent 5f1a61e commit 0029bb3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
4 changes: 2 additions & 2 deletions boards/nrf6310/Makefile.features
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
CPU_MODEL = nrf51x22xxaa

# Put defined MCU peripherals here (in alphabetical order)
FEATURES_PROVIDED += periph_spi
FEATURES_PROVIDED += periph_uart

# include common nrf51 based boards features
include $(RIOTBOARD)/common/nrf51/Makefile.features

include $(RIOTCPU)/nrf51/Makefile.features
3 changes: 0 additions & 3 deletions boards/nrf6310/Makefile.include
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# define the used CPU
export CPU_MODEL = nrf51x22xxaa

# set default port depending on operating system
PORT_LINUX ?= /dev/ttyUSB0
PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
Expand Down

0 comments on commit 0029bb3

Please sign in to comment.