From 0029bb33ef1e3e0b56666d98c192e1661bb4d3b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= Date: Thu, 15 Aug 2019 11:47:07 +0200 Subject: [PATCH] boards/nrf6310: move CPU/CPU_MODEL definition to Makefile.features 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. --- boards/nrf6310/Makefile.features | 4 ++-- boards/nrf6310/Makefile.include | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/boards/nrf6310/Makefile.features b/boards/nrf6310/Makefile.features index d2712cafab..46b201fafb 100644 --- a/boards/nrf6310/Makefile.features +++ b/boards/nrf6310/Makefile.features @@ -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 diff --git a/boards/nrf6310/Makefile.include b/boards/nrf6310/Makefile.include index a70b6acf73..26fa8f3365 100644 --- a/boards/nrf6310/Makefile.include +++ b/boards/nrf6310/Makefile.include @@ -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*)))