From 636285ebe407c9d7cb209095a3a5d7f14af94366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= Date: Mon, 3 Jun 2019 11:08:02 +0200 Subject: [PATCH] boards: 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/acd52832/Makefile.features | 2 ++ boards/acd52832/Makefile.include | 3 --- boards/airfy-beacon/Makefile.features | 2 ++ boards/airfy-beacon/Makefile.include | 3 --- boards/arduino-duemilanove/Makefile.features | 4 ++-- boards/arduino-duemilanove/Makefile.include | 3 --- boards/arduino-leonardo/Makefile.features | 4 ++-- boards/arduino-leonardo/Makefile.include | 3 --- boards/arduino-mega2560/Makefile.features | 4 ++-- boards/arduino-mega2560/Makefile.include | 3 --- boards/arduino-mkr1000/Makefile.features | 2 -- boards/arduino-mkrfox1200/Makefile.features | 2 -- boards/arduino-mkrzero/Makefile.features | 2 -- boards/arduino-nano/Makefile.features | 4 ++-- boards/arduino-nano/Makefile.include | 3 --- boards/arduino-uno/Makefile.features | 4 ++-- boards/arduino-uno/Makefile.include | 3 --- boards/arduino-zero/Makefile.features | 5 +++-- boards/arduino-zero/Makefile.include | 4 ---- boards/b-l072z-lrwan1/Makefile.features | 5 +++-- boards/b-l072z-lrwan1/Makefile.include | 4 ---- boards/b-l475e-iot01a/Makefile.features | 5 +++-- boards/b-l475e-iot01a/Makefile.include | 4 ---- boards/calliope-mini/Makefile.features | 2 ++ boards/calliope-mini/Makefile.include | 3 --- boards/cc2650-launchpad/Makefile.features | 5 +++-- boards/cc2650-launchpad/Makefile.include | 2 -- boards/cc2650stk/Makefile.features | 5 +++-- boards/cc2650stk/Makefile.include | 2 -- boards/chronos/Makefile.features | 5 +++-- boards/chronos/Makefile.include | 4 ---- boards/common/particle-mesh/Makefile.features | 2 ++ boards/common/particle-mesh/Makefile.include | 2 -- boards/f4vi1/Makefile.features | 6 ++++-- boards/f4vi1/Makefile.include | 4 ---- boards/feather-m0/Makefile.features | 5 +++-- boards/feather-m0/Makefile.include | 4 ---- boards/fox/Makefile.features | 5 +++-- boards/fox/Makefile.include | 4 ---- boards/frdm-k22f/Makefile.dep | 2 -- boards/frdm-k22f/Makefile.features | 5 +++-- boards/frdm-k22f/Makefile.include | 4 ---- boards/frdm-k64f/Makefile.dep | 2 -- boards/frdm-k64f/Makefile.features | 5 +++-- boards/frdm-k64f/Makefile.include | 4 ---- boards/hamilton/Makefile.features | 5 +++-- boards/hamilton/Makefile.include | 4 ---- boards/i-nucleo-lrwan1/Makefile.features | 5 +++-- boards/i-nucleo-lrwan1/Makefile.include | 4 ---- boards/ikea-tradfri/Makefile.dep | 2 -- boards/ikea-tradfri/Makefile.features | 5 +++-- boards/ikea-tradfri/Makefile.include | 4 ---- boards/iotlab-a8-m3/Makefile.features | 2 -- boards/iotlab-m3/Makefile.features | 2 -- boards/jiminy-mega256rfr2/Makefile.features | 4 ++-- boards/jiminy-mega256rfr2/Makefile.include | 3 --- boards/limifrog-v1/Makefile.features | 5 +++-- boards/limifrog-v1/Makefile.include | 4 ---- boards/lobaro-lorabox/Makefile.features | 5 +++-- boards/lobaro-lorabox/Makefile.include | 4 ---- boards/lsn50/Makefile.features | 5 +++-- boards/lsn50/Makefile.include | 4 ---- boards/maple-mini/Makefile.features | 5 +++-- boards/maple-mini/Makefile.include | 4 ---- boards/mbed_lpc1768/Makefile.features | 4 ++-- boards/mbed_lpc1768/Makefile.include | 3 --- boards/mega-xplained/Makefile.features | 4 ++-- boards/mega-xplained/Makefile.include | 3 --- boards/microbit/Makefile.features | 2 ++ boards/microbit/Makefile.include | 3 --- boards/msbiot/Makefile.features | 5 +++-- boards/msbiot/Makefile.include | 4 ---- boards/native/Makefile.features | 4 ++-- boards/native/Makefile.include | 2 -- boards/nrf51dk/Makefile.features | 2 ++ boards/nrf51dk/Makefile.include | 3 --- boards/nrf51dongle/Makefile.features | 2 ++ boards/nrf51dongle/Makefile.include | 3 --- boards/nrf52832-mdk/Makefile.features | 2 ++ boards/nrf52832-mdk/Makefile.include | 2 -- boards/nrf52840-mdk/Makefile.features | 2 ++ boards/nrf52840-mdk/Makefile.include | 2 -- boards/nrf52840dk/Makefile.features | 2 ++ boards/nrf52840dk/Makefile.include | 2 -- boards/nrf52dk/Makefile.features | 2 ++ boards/nrf52dk/Makefile.include | 2 -- boards/nucleo-f030r8/Makefile.features | 5 +++-- boards/nucleo-f030r8/Makefile.include | 4 ---- boards/nucleo-f031k6/Makefile.features | 5 +++-- boards/nucleo-f031k6/Makefile.include | 4 ---- boards/nucleo-f042k6/Makefile.features | 5 +++-- boards/nucleo-f042k6/Makefile.include | 4 ---- boards/nucleo-f070rb/Makefile.features | 5 +++-- boards/nucleo-f070rb/Makefile.include | 4 ---- boards/nucleo-f072rb/Makefile.features | 5 +++-- boards/nucleo-f072rb/Makefile.include | 4 ---- boards/nucleo-f091rc/Makefile.features | 5 +++-- boards/nucleo-f091rc/Makefile.include | 4 ---- boards/nucleo-f103rb/Makefile.features | 5 +++-- boards/nucleo-f103rb/Makefile.include | 4 ---- boards/nucleo-f207zg/Makefile.features | 5 +++-- boards/nucleo-f207zg/Makefile.include | 4 ---- boards/nucleo-f302r8/Makefile.features | 5 +++-- boards/nucleo-f302r8/Makefile.include | 4 ---- boards/nucleo-f303k8/Makefile.features | 5 +++-- boards/nucleo-f303k8/Makefile.include | 4 ---- boards/nucleo-f303re/Makefile.features | 5 +++-- boards/nucleo-f303re/Makefile.include | 4 ---- boards/nucleo-f303ze/Makefile.features | 5 +++-- boards/nucleo-f303ze/Makefile.include | 4 ---- boards/nucleo-f334r8/Makefile.features | 5 +++-- boards/nucleo-f334r8/Makefile.include | 4 ---- boards/nucleo-f401re/Makefile.features | 5 +++-- boards/nucleo-f401re/Makefile.include | 4 ---- boards/nucleo-f410rb/Makefile.features | 5 +++-- boards/nucleo-f410rb/Makefile.include | 4 ---- boards/nucleo-f411re/Makefile.features | 5 +++-- boards/nucleo-f411re/Makefile.include | 4 ---- boards/nucleo-f412zg/Makefile.features | 5 +++-- boards/nucleo-f412zg/Makefile.include | 4 ---- boards/nucleo-f413zh/Makefile.features | 5 +++-- boards/nucleo-f413zh/Makefile.include | 4 ---- boards/nucleo-f429zi/Makefile.features | 5 +++-- boards/nucleo-f429zi/Makefile.include | 4 ---- boards/nucleo-f446re/Makefile.features | 5 +++-- boards/nucleo-f446re/Makefile.include | 4 ---- boards/nucleo-f446ze/Makefile.features | 5 +++-- boards/nucleo-f446ze/Makefile.include | 4 ---- boards/nucleo-f722ze/Makefile.features | 5 +++-- boards/nucleo-f722ze/Makefile.include | 4 ---- boards/nucleo-f746zg/Makefile.features | 5 +++-- boards/nucleo-f746zg/Makefile.include | 4 ---- boards/nucleo-f767zi/Makefile.features | 5 +++-- boards/nucleo-f767zi/Makefile.include | 4 ---- boards/nucleo-l031k6/Makefile.features | 5 +++-- boards/nucleo-l031k6/Makefile.include | 4 ---- boards/nucleo-l053r8/Makefile.features | 5 +++-- boards/nucleo-l053r8/Makefile.include | 4 ---- boards/nucleo-l073rz/Makefile.features | 5 +++-- boards/nucleo-l073rz/Makefile.include | 4 ---- boards/nucleo-l152re/Makefile.features | 5 +++-- boards/nucleo-l152re/Makefile.include | 4 ---- boards/nucleo-l432kc/Makefile.features | 5 +++-- boards/nucleo-l432kc/Makefile.include | 4 ---- boards/nucleo-l433rc/Makefile.features | 5 +++-- boards/nucleo-l433rc/Makefile.include | 4 ---- boards/nucleo-l452re/Makefile.features | 5 +++-- boards/nucleo-l452re/Makefile.include | 4 ---- boards/nucleo-l476rg/Makefile.features | 5 +++-- boards/nucleo-l476rg/Makefile.include | 4 ---- boards/nucleo-l496zg/Makefile.features | 5 +++-- boards/nucleo-l496zg/Makefile.include | 4 ---- boards/nucleo-l4r5zi/Makefile.features | 5 +++-- boards/nucleo-l4r5zi/Makefile.include | 4 ---- boards/nz32-sc151/Makefile.features | 5 +++-- boards/nz32-sc151/Makefile.include | 4 ---- boards/opencm904/Makefile.features | 5 +++-- boards/opencm904/Makefile.include | 4 ---- boards/openmote-b/Makefile.features | 5 +++-- boards/openmote-b/Makefile.include | 4 ---- boards/openmote-cc2538/Makefile.features | 5 +++-- boards/openmote-cc2538/Makefile.include | 4 ---- boards/pba-d-01-kw2x/Makefile.dep | 2 -- boards/pba-d-01-kw2x/Makefile.features | 8 ++++++-- boards/pba-d-01-kw2x/Makefile.include | 8 -------- boards/pyboard/Makefile.features | 5 +++-- boards/pyboard/Makefile.include | 4 ---- boards/reel/Makefile.features | 2 ++ boards/reel/Makefile.include | 3 --- boards/ruuvitag/Makefile.features | 2 ++ boards/ruuvitag/Makefile.include | 3 --- boards/samd21-xpro/Makefile.features | 5 +++-- boards/samd21-xpro/Makefile.include | 4 ---- boards/same54-xpro/Makefile.features | 5 +++-- boards/same54-xpro/Makefile.include | 4 ---- boards/saml10-xpro/Makefile.features | 2 ++ boards/saml10-xpro/Makefile.include | 1 - boards/saml11-xpro/Makefile.features | 2 ++ boards/saml11-xpro/Makefile.include | 1 - boards/saml21-xpro/Makefile.features | 5 +++-- boards/saml21-xpro/Makefile.include | 3 --- boards/samr21-xpro/Makefile.features | 5 +++-- boards/samr21-xpro/Makefile.include | 4 ---- boards/samr30-xpro/Makefile.features | 6 +++--- boards/samr30-xpro/Makefile.include | 4 ---- boards/seeeduino_arch-pro/Makefile.features | 4 ++-- boards/seeeduino_arch-pro/Makefile.include | 3 --- boards/sensebox_samd21/Makefile.features | 5 +++-- boards/sensebox_samd21/Makefile.include | 4 ---- boards/slstk3401a/Makefile.dep | 2 -- boards/slstk3401a/Makefile.features | 5 +++-- boards/slstk3401a/Makefile.include | 4 ---- boards/slstk3402a/Makefile.dep | 2 -- boards/slstk3402a/Makefile.features | 5 +++-- boards/slstk3402a/Makefile.include | 4 ---- boards/sltb001a/Makefile.dep | 2 -- boards/sltb001a/Makefile.features | 5 +++-- boards/sltb001a/Makefile.include | 4 ---- boards/slwstk6220a/Makefile.features | 5 +++-- boards/slwstk6220a/Makefile.include | 4 ---- boards/sodaq-autonomo/Makefile.features | 5 +++-- boards/sodaq-autonomo/Makefile.include | 4 ---- boards/sodaq-explorer/Makefile.features | 5 +++-- boards/sodaq-explorer/Makefile.include | 4 ---- boards/sodaq-one/Makefile.features | 5 +++-- boards/sodaq-one/Makefile.include | 4 ---- boards/sodaq-sara-aff/Makefile.features | 5 +++-- boards/sodaq-sara-aff/Makefile.include | 4 ---- boards/spark-core/Makefile.features | 5 +++-- boards/spark-core/Makefile.include | 4 ---- boards/stk3600/Makefile.dep | 2 -- boards/stk3600/Makefile.features | 5 +++-- boards/stk3600/Makefile.include | 4 ---- boards/stk3700/Makefile.dep | 2 -- boards/stk3700/Makefile.features | 5 +++-- boards/stk3700/Makefile.include | 4 ---- boards/stm32f0discovery/Makefile.features | 5 +++-- boards/stm32f0discovery/Makefile.include | 4 ---- boards/stm32f3discovery/Makefile.features | 5 +++-- boards/stm32f3discovery/Makefile.include | 4 ---- boards/stm32f429i-disc1/Makefile.features | 5 +++-- boards/stm32f429i-disc1/Makefile.include | 4 ---- boards/stm32f4discovery/Makefile.features | 5 +++-- boards/stm32f4discovery/Makefile.include | 4 ---- boards/stm32f769i-disco/Makefile.features | 5 +++-- boards/stm32f769i-disco/Makefile.include | 4 ---- boards/stm32l0538-disco/Makefile.features | 5 +++-- boards/stm32l0538-disco/Makefile.include | 4 ---- boards/stm32l476g-disco/Makefile.features | 5 +++-- boards/stm32l476g-disco/Makefile.include | 4 ---- boards/teensy31/Makefile.dep | 1 - boards/teensy31/Makefile.features | 5 +++-- boards/teensy31/Makefile.include | 4 ---- boards/telosb/Makefile.features | 5 +++-- boards/telosb/Makefile.include | 4 ---- boards/thingy52/Makefile.features | 2 ++ boards/thingy52/Makefile.include | 3 --- boards/ublox-c030-u201/Makefile.features | 5 +++-- boards/ublox-c030-u201/Makefile.include | 4 ---- boards/waspmote-pro/Makefile.features | 4 ++-- boards/waspmote-pro/Makefile.include | 3 --- boards/yunjia-nrf51822/Makefile.features | 2 ++ boards/yunjia-nrf51822/Makefile.include | 3 --- boards/z1/Makefile.features | 5 +++-- boards/z1/Makefile.include | 4 ---- 245 files changed, 321 insertions(+), 647 deletions(-) diff --git a/boards/acd52832/Makefile.features b/boards/acd52832/Makefile.features index a489a2334b..2fdf8d84f8 100644 --- a/boards/acd52832/Makefile.features +++ b/boards/acd52832/Makefile.features @@ -1,3 +1,5 @@ +CPU_MODEL = nrf52832xxaa + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_spi diff --git a/boards/acd52832/Makefile.include b/boards/acd52832/Makefile.include index aa09e9ea14..7464e87d14 100644 --- a/boards/acd52832/Makefile.include +++ b/boards/acd52832/Makefile.include @@ -1,6 +1,3 @@ -# define the cpu used by the acd52832 -export CPU_MODEL = nrf52832xxaa - # set default port depending on operating system PORT_LINUX ?= /dev/ttyUSB0 diff --git a/boards/airfy-beacon/Makefile.features b/boards/airfy-beacon/Makefile.features index e5a4957546..baee32552f 100644 --- a/boards/airfy-beacon/Makefile.features +++ b/boards/airfy-beacon/Makefile.features @@ -1,3 +1,5 @@ +CPU_MODEL = nrf51x22xxaa + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_i2c diff --git a/boards/airfy-beacon/Makefile.include b/boards/airfy-beacon/Makefile.include index e73b42a69b..27f80f29b8 100644 --- a/boards/airfy-beacon/Makefile.include +++ b/boards/airfy-beacon/Makefile.include @@ -1,6 +1,3 @@ -# define the used CPU model -export CPU_MODEL = nrf51x22xxaa - # include common nrf51 boards module into the build USEMODULE += boards_common_nrf51 diff --git a/boards/arduino-duemilanove/Makefile.features b/boards/arduino-duemilanove/Makefile.features index b3d37cc98b..fdceb9913c 100644 --- a/boards/arduino-duemilanove/Makefile.features +++ b/boards/arduino-duemilanove/Makefile.features @@ -1,3 +1,3 @@ -include $(RIOTBOARD)/common/arduino-atmega/Makefile.features +CPU = atmega328p -include $(RIOTCPU)/atmega328p/Makefile.features +include $(RIOTBOARD)/common/arduino-atmega/Makefile.features diff --git a/boards/arduino-duemilanove/Makefile.include b/boards/arduino-duemilanove/Makefile.include index 96b667a44c..9fb335b3ba 100644 --- a/boards/arduino-duemilanove/Makefile.include +++ b/boards/arduino-duemilanove/Makefile.include @@ -1,6 +1,3 @@ -# define the cpu used by the ardudino duemilanove board -export CPU = atmega328p - # configure the terminal program PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) diff --git a/boards/arduino-leonardo/Makefile.features b/boards/arduino-leonardo/Makefile.features index 00b2d135b8..20de13ea29 100644 --- a/boards/arduino-leonardo/Makefile.features +++ b/boards/arduino-leonardo/Makefile.features @@ -1,3 +1,3 @@ -include $(RIOTBOARD)/common/arduino-atmega/Makefile.features +CPU = atmega32u4 -include $(RIOTCPU)/atmega32u4/Makefile.features +include $(RIOTBOARD)/common/arduino-atmega/Makefile.features diff --git a/boards/arduino-leonardo/Makefile.include b/boards/arduino-leonardo/Makefile.include index 886a694c23..77d57200e8 100644 --- a/boards/arduino-leonardo/Makefile.include +++ b/boards/arduino-leonardo/Makefile.include @@ -1,6 +1,3 @@ -# define the cpu used by the arduino uno board -export CPU = atmega32u4 - PORT_LINUX ?= /dev/ttyUSB0 AVRDUDE_PORT ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) diff --git a/boards/arduino-mega2560/Makefile.features b/boards/arduino-mega2560/Makefile.features index 67246c4e1a..67cfedb7dd 100644 --- a/boards/arduino-mega2560/Makefile.features +++ b/boards/arduino-mega2560/Makefile.features @@ -1,4 +1,4 @@ +CPU = atmega2560 + FEATURES_PROVIDED += puf_sram include $(RIOTBOARD)/common/arduino-atmega/Makefile.features - -include $(RIOTCPU)/atmega2560/Makefile.features diff --git a/boards/arduino-mega2560/Makefile.include b/boards/arduino-mega2560/Makefile.include index 748d6f5f7f..58145a370c 100644 --- a/boards/arduino-mega2560/Makefile.include +++ b/boards/arduino-mega2560/Makefile.include @@ -1,6 +1,3 @@ -# define the cpu used by the arduino mega2560 board -export CPU = atmega2560 - USEMODULE += boards_common_arduino-atmega # configure the terminal program diff --git a/boards/arduino-mkr1000/Makefile.features b/boards/arduino-mkr1000/Makefile.features index 448878b033..21166716c7 100644 --- a/boards/arduino-mkr1000/Makefile.features +++ b/boards/arduino-mkr1000/Makefile.features @@ -1,3 +1 @@ include $(RIOTBOARD)/common/arduino-mkr/Makefile.features - -include $(RIOTCPU)/samd21/Makefile.features diff --git a/boards/arduino-mkrfox1200/Makefile.features b/boards/arduino-mkrfox1200/Makefile.features index 448878b033..21166716c7 100644 --- a/boards/arduino-mkrfox1200/Makefile.features +++ b/boards/arduino-mkrfox1200/Makefile.features @@ -1,3 +1 @@ include $(RIOTBOARD)/common/arduino-mkr/Makefile.features - -include $(RIOTCPU)/samd21/Makefile.features diff --git a/boards/arduino-mkrzero/Makefile.features b/boards/arduino-mkrzero/Makefile.features index 448878b033..21166716c7 100644 --- a/boards/arduino-mkrzero/Makefile.features +++ b/boards/arduino-mkrzero/Makefile.features @@ -1,3 +1 @@ include $(RIOTBOARD)/common/arduino-mkr/Makefile.features - -include $(RIOTCPU)/samd21/Makefile.features diff --git a/boards/arduino-nano/Makefile.features b/boards/arduino-nano/Makefile.features index b3d37cc98b..fdceb9913c 100644 --- a/boards/arduino-nano/Makefile.features +++ b/boards/arduino-nano/Makefile.features @@ -1,3 +1,3 @@ -include $(RIOTBOARD)/common/arduino-atmega/Makefile.features +CPU = atmega328p -include $(RIOTCPU)/atmega328p/Makefile.features +include $(RIOTBOARD)/common/arduino-atmega/Makefile.features diff --git a/boards/arduino-nano/Makefile.include b/boards/arduino-nano/Makefile.include index c6908754f3..674107ae00 100644 --- a/boards/arduino-nano/Makefile.include +++ b/boards/arduino-nano/Makefile.include @@ -1,6 +1,3 @@ -# define the cpu used by the Arduino Nano board -export CPU = atmega328p - # configure the terminal program PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) diff --git a/boards/arduino-uno/Makefile.features b/boards/arduino-uno/Makefile.features index b3d37cc98b..fdceb9913c 100644 --- a/boards/arduino-uno/Makefile.features +++ b/boards/arduino-uno/Makefile.features @@ -1,3 +1,3 @@ -include $(RIOTBOARD)/common/arduino-atmega/Makefile.features +CPU = atmega328p -include $(RIOTCPU)/atmega328p/Makefile.features +include $(RIOTBOARD)/common/arduino-atmega/Makefile.features diff --git a/boards/arduino-uno/Makefile.include b/boards/arduino-uno/Makefile.include index fa61f17fe4..09edce4764 100644 --- a/boards/arduino-uno/Makefile.include +++ b/boards/arduino-uno/Makefile.include @@ -1,6 +1,3 @@ -# define the cpu used by the arduino uno board -export CPU = atmega328p - # configure the terminal program PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) diff --git a/boards/arduino-zero/Makefile.features b/boards/arduino-zero/Makefile.features index eb9c06067a..b6c34c06be 100644 --- a/boards/arduino-zero/Makefile.features +++ b/boards/arduino-zero/Makefile.features @@ -1,3 +1,6 @@ +CPU = samd21 +CPU_MODEL = samd21g18a + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_pwm @@ -10,5 +13,3 @@ FEATURES_PROVIDED += periph_usbdev # Various other features (if any) FEATURES_PROVIDED += arduino - -include $(RIOTCPU)/samd21/Makefile.features diff --git a/boards/arduino-zero/Makefile.include b/boards/arduino-zero/Makefile.include index 3e01a78055..f4f23e1b66 100644 --- a/boards/arduino-zero/Makefile.include +++ b/boards/arduino-zero/Makefile.include @@ -1,7 +1,3 @@ -# define the cpu used by Arduino/Genuino Zero board -export CPU = samd21 -export CPU_MODEL = samd21g18a - # set edbg device type EDBG_DEVICE_TYPE = atmel_cm0p diff --git a/boards/b-l072z-lrwan1/Makefile.features b/boards/b-l072z-lrwan1/Makefile.features index 928593ed9c..2a98fd01ad 100644 --- a/boards/b-l072z-lrwan1/Makefile.features +++ b/boards/b-l072z-lrwan1/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32l0 +CPU_MODEL = stm32l072cz + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_dma FEATURES_PROVIDED += periph_i2c @@ -12,5 +15,3 @@ FEATURES_PROVIDED += periph_uart # The 0.10.0 openocd version in Ubuntu Bionic doesn't work. The change was # introduced after Jun 8, 2017 - v0.10.0-1-20170607-2132-dev. FEATURES_PROVIDED += riotboot - -include $(RIOTCPU)/stm32l0/Makefile.features diff --git a/boards/b-l072z-lrwan1/Makefile.include b/boards/b-l072z-lrwan1/Makefile.include index 8c5857aafc..e4a0c43e56 100644 --- a/boards/b-l072z-lrwan1/Makefile.include +++ b/boards/b-l072z-lrwan1/Makefile.include @@ -1,7 +1,3 @@ -## the cpu to build for -export CPU = stm32l0 -export CPU_MODEL = stm32l072cz - # we use shared STM32 configuration snippets INCLUDES += -I$(RIOTBOARD)/common/stm32/include diff --git a/boards/b-l475e-iot01a/Makefile.features b/boards/b-l475e-iot01a/Makefile.features index 3c3d3d6870..9e3cfd9166 100644 --- a/boards/b-l475e-iot01a/Makefile.features +++ b/boards/b-l475e-iot01a/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32l4 +CPU_MODEL = stm32l475vg + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_dma FEATURES_PROVIDED += periph_i2c @@ -10,5 +13,3 @@ FEATURES_PROVIDED += periph_uart # Put other features for this board (in alphabetical order) FEATURES_PROVIDED += riotboot - -include $(RIOTCPU)/stm32l4/Makefile.features diff --git a/boards/b-l475e-iot01a/Makefile.include b/boards/b-l475e-iot01a/Makefile.include index 7ab1ad1004..4e38028ae2 100644 --- a/boards/b-l475e-iot01a/Makefile.include +++ b/boards/b-l475e-iot01a/Makefile.include @@ -1,7 +1,3 @@ -# the cpu to build for -export CPU = stm32l4 -export CPU_MODEL = stm32l475vg - # we use shared STM32 configuration snippets INCLUDES += -I$(RIOTBOARD)/common/stm32/include diff --git a/boards/calliope-mini/Makefile.features b/boards/calliope-mini/Makefile.features index 18eeae03c8..ab04f03cd6 100644 --- a/boards/calliope-mini/Makefile.features +++ b/boards/calliope-mini/Makefile.features @@ -1,3 +1,5 @@ +CPU_MODEL = nrf51x22xxab + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_uart diff --git a/boards/calliope-mini/Makefile.include b/boards/calliope-mini/Makefile.include index e31f9f65e2..871d8adbf2 100644 --- a/boards/calliope-mini/Makefile.include +++ b/boards/calliope-mini/Makefile.include @@ -1,6 +1,3 @@ -# define the used CPU -export CPU_MODEL = nrf51x22xxab - # define the default port depending on the host OS PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) diff --git a/boards/cc2650-launchpad/Makefile.features b/boards/cc2650-launchpad/Makefile.features index 09d23b4f1f..4d34402c1f 100644 --- a/boards/cc2650-launchpad/Makefile.features +++ b/boards/cc2650-launchpad/Makefile.features @@ -1,7 +1,8 @@ +CPU = cc26x0 +CPU_MODEL = cc26x0f128 + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_gpio periph_gpio_irq FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += periph_i2c - -include $(RIOTCPU)/cc26x0/Makefile.features diff --git a/boards/cc2650-launchpad/Makefile.include b/boards/cc2650-launchpad/Makefile.include index 846fd7f0b7..5d85312987 100644 --- a/boards/cc2650-launchpad/Makefile.include +++ b/boards/cc2650-launchpad/Makefile.include @@ -1,5 +1,3 @@ -export CPU = cc26x0 -export CPU_MODEL = cc26x0f128 export XDEBUGGER = XDS110 # set default port depending on operating system diff --git a/boards/cc2650stk/Makefile.features b/boards/cc2650stk/Makefile.features index 1276d21941..96835c7e4f 100644 --- a/boards/cc2650stk/Makefile.features +++ b/boards/cc2650stk/Makefile.features @@ -1,7 +1,8 @@ +CPU = cc26x0 +CPU_MODEL = cc26x0f128 + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_gpio periph_gpio_irq FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart - -include $(RIOTCPU)/cc26x0/Makefile.features diff --git a/boards/cc2650stk/Makefile.include b/boards/cc2650stk/Makefile.include index b2e2846c66..8cdf06fd39 100644 --- a/boards/cc2650stk/Makefile.include +++ b/boards/cc2650stk/Makefile.include @@ -1,5 +1,3 @@ -export CPU = cc26x0 -export CPU_MODEL = cc26x0f128 export XDEBUGGER = XDS110 # set default port depending on operating system diff --git a/boards/chronos/Makefile.features b/boards/chronos/Makefile.features index 11738c6453..78e17d61bb 100644 --- a/boards/chronos/Makefile.features +++ b/boards/chronos/Makefile.features @@ -1,7 +1,8 @@ +CPU = cc430 +CPU_MODEL = cc430f6137 + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_rtc # Various other features (if any) - -include $(RIOTCPU)/cc430/Makefile.features diff --git a/boards/chronos/Makefile.include b/boards/chronos/Makefile.include index b2b7c422b5..79a72d0394 100644 --- a/boards/chronos/Makefile.include +++ b/boards/chronos/Makefile.include @@ -1,7 +1,3 @@ -## the cpu to build for -export CPU = cc430 -export CPU_MODEL = cc430f6137 - # flasher configuration FLASHFILE ?= $(HEXFILE) FLASHER = mspdebug diff --git a/boards/common/particle-mesh/Makefile.features b/boards/common/particle-mesh/Makefile.features index 72d4df5942..bb77f3ce1c 100644 --- a/boards/common/particle-mesh/Makefile.features +++ b/boards/common/particle-mesh/Makefile.features @@ -1,3 +1,5 @@ +CPU_MODEL = nrf52840xxaa + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_spi diff --git a/boards/common/particle-mesh/Makefile.include b/boards/common/particle-mesh/Makefile.include index 6d393ec199..ec5342c172 100644 --- a/boards/common/particle-mesh/Makefile.include +++ b/boards/common/particle-mesh/Makefile.include @@ -1,5 +1,3 @@ -export CPU_MODEL = nrf52840xxaa - # set default port depending on operating system PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) diff --git a/boards/f4vi1/Makefile.features b/boards/f4vi1/Makefile.features index 5ddfcef7e9..7f105a73c4 100644 --- a/boards/f4vi1/Makefile.features +++ b/boards/f4vi1/Makefile.features @@ -1,5 +1,7 @@ +CPU = stm32f4 +CPU_MODEL = stm32f415rg + + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart - -include $(RIOTCPU)/stm32f4/Makefile.features diff --git a/boards/f4vi1/Makefile.include b/boards/f4vi1/Makefile.include index 5d01c76723..67c9c660c2 100644 --- a/boards/f4vi1/Makefile.include +++ b/boards/f4vi1/Makefile.include @@ -1,7 +1,3 @@ -# define the cpu used by the stm32f4-discovery board -export CPU = stm32f4 -export CPU_MODEL = stm32f415rg - # we use shared STM32 configuration snippets INCLUDES += -I$(RIOTBOARD)/common/stm32/include diff --git a/boards/feather-m0/Makefile.features b/boards/feather-m0/Makefile.features index 78ab406ef9..254a910c83 100644 --- a/boards/feather-m0/Makefile.features +++ b/boards/feather-m0/Makefile.features @@ -1,3 +1,6 @@ +CPU = samd21 +CPU_MODEL = samd21g18a + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_i2c @@ -8,5 +11,3 @@ FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += periph_usbdev - -include $(RIOTCPU)/samd21/Makefile.features diff --git a/boards/feather-m0/Makefile.include b/boards/feather-m0/Makefile.include index 1379586a70..bdb615db03 100644 --- a/boards/feather-m0/Makefile.include +++ b/boards/feather-m0/Makefile.include @@ -1,7 +1,3 @@ -# define the cpu used by Adafruit Feather M0 boards -export CPU = samd21 -export CPU_MODEL = samd21g18a - PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) diff --git a/boards/fox/Makefile.features b/boards/fox/Makefile.features index 1951d8d407..b5aef31c5d 100644 --- a/boards/fox/Makefile.features +++ b/boards/fox/Makefile.features @@ -1,8 +1,9 @@ +CPU = stm32f1 +CPU_MODEL = stm32f103re + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_rtt FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart - -include $(RIOTCPU)/stm32f1/Makefile.features diff --git a/boards/fox/Makefile.include b/boards/fox/Makefile.include index 30ea922487..8ebfabac89 100644 --- a/boards/fox/Makefile.include +++ b/boards/fox/Makefile.include @@ -1,7 +1,3 @@ -## the cpu to build for -export CPU = stm32f1 -export CPU_MODEL = stm32f103re - # set default port depending on operating system PORT_LINUX ?= /dev/ttyUSB1 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbserial*))) diff --git a/boards/frdm-k22f/Makefile.dep b/boards/frdm-k22f/Makefile.dep index a73981801a..2abcbc1548 100644 --- a/boards/frdm-k22f/Makefile.dep +++ b/boards/frdm-k22f/Makefile.dep @@ -2,5 +2,3 @@ ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += saul_gpio USEMODULE += saul_adc endif - -include $(RIOTCPU)/kinetis/Makefile.dep diff --git a/boards/frdm-k22f/Makefile.features b/boards/frdm-k22f/Makefile.features index 1c455fb071..ad0c14aa47 100644 --- a/boards/frdm-k22f/Makefile.features +++ b/boards/frdm-k22f/Makefile.features @@ -1,3 +1,6 @@ +CPU = kinetis +CPU_MODEL = mk22fn512vlh12 + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_i2c @@ -7,5 +10,3 @@ FEATURES_PROVIDED += periph_rtt FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart - -include $(RIOTCPU)/kinetis/Makefile.features diff --git a/boards/frdm-k22f/Makefile.include b/boards/frdm-k22f/Makefile.include index 3b80df57d4..b409af5172 100644 --- a/boards/frdm-k22f/Makefile.include +++ b/boards/frdm-k22f/Makefile.include @@ -1,6 +1,2 @@ -# define the cpu used by the board -export CPU = kinetis -export CPU_MODEL = mk22fn512vlh12 - # Include default FRDM board config include $(RIOTBOARD)/common/frdm/Makefile.include diff --git a/boards/frdm-k64f/Makefile.dep b/boards/frdm-k64f/Makefile.dep index 6d37e3255d..f90ca4ce94 100644 --- a/boards/frdm-k64f/Makefile.dep +++ b/boards/frdm-k64f/Makefile.dep @@ -1,5 +1,3 @@ ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += saul_adc endif - -include $(RIOTCPU)/kinetis/Makefile.dep diff --git a/boards/frdm-k64f/Makefile.features b/boards/frdm-k64f/Makefile.features index a59de76bd0..534ff9b68d 100644 --- a/boards/frdm-k64f/Makefile.features +++ b/boards/frdm-k64f/Makefile.features @@ -1,3 +1,6 @@ +CPU = kinetis +CPU_MODEL = mk64fn1m0vll12 + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_i2c @@ -10,5 +13,3 @@ FEATURES_PROVIDED += periph_uart # Put other features for this board (in alphabetical order) FEATURES_PROVIDED += riotboot - -include $(RIOTCPU)/kinetis/Makefile.features diff --git a/boards/frdm-k64f/Makefile.include b/boards/frdm-k64f/Makefile.include index 1e9a59d3a6..b409af5172 100644 --- a/boards/frdm-k64f/Makefile.include +++ b/boards/frdm-k64f/Makefile.include @@ -1,6 +1,2 @@ -# define the cpu used by the FRDM-K64F board -export CPU = kinetis -export CPU_MODEL = mk64fn1m0vll12 - # Include default FRDM board config include $(RIOTBOARD)/common/frdm/Makefile.include diff --git a/boards/hamilton/Makefile.features b/boards/hamilton/Makefile.features index 91b6b8ef83..d22e086b51 100644 --- a/boards/hamilton/Makefile.features +++ b/boards/hamilton/Makefile.features @@ -1,3 +1,6 @@ +CPU = samd21 +CPU_MODEL = samr21e18a + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_gpio periph_gpio_irq @@ -7,5 +10,3 @@ FEATURES_PROVIDED += periph_rtc FEATURES_PROVIDED += periph_rtt FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_timer - --include $(RIOTCPU)/samd21/Makefile.features diff --git a/boards/hamilton/Makefile.include b/boards/hamilton/Makefile.include index b0e0a9ebce..b253623185 100644 --- a/boards/hamilton/Makefile.include +++ b/boards/hamilton/Makefile.include @@ -1,7 +1,3 @@ -# define the cpu used by Hamilton -export CPU = samd21 -export CPU_MODEL = samr21e18a - # debugger config export JLINK_DEVICE := atsamr21e18a export OBJDUMPFLAGS += --disassemble --source --disassembler-options=force-thumb diff --git a/boards/i-nucleo-lrwan1/Makefile.features b/boards/i-nucleo-lrwan1/Makefile.features index e69459099f..126bc7f697 100644 --- a/boards/i-nucleo-lrwan1/Makefile.features +++ b/boards/i-nucleo-lrwan1/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32l0 +CPU_MODEL = stm32l052t8 + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_lpuart @@ -6,5 +9,3 @@ FEATURES_PROVIDED += periph_rtt FEATURES_PROVIDED += periph_spi periph_spi_gpio_mode FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart - -include $(RIOTCPU)/stm32l0/Makefile.features diff --git a/boards/i-nucleo-lrwan1/Makefile.include b/boards/i-nucleo-lrwan1/Makefile.include index 6039875503..e2b9138636 100644 --- a/boards/i-nucleo-lrwan1/Makefile.include +++ b/boards/i-nucleo-lrwan1/Makefile.include @@ -1,7 +1,3 @@ -## the cpu to build for -export CPU = stm32l0 -export CPU_MODEL = stm32l052t8 - # we use shared STM32 configuration snippets INCLUDES += -I$(RIOTBOARD)/common/stm32/include diff --git a/boards/ikea-tradfri/Makefile.dep b/boards/ikea-tradfri/Makefile.dep index 7a8feb2f81..5472bf8b8d 100644 --- a/boards/ikea-tradfri/Makefile.dep +++ b/boards/ikea-tradfri/Makefile.dep @@ -1,5 +1,3 @@ ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += saul_gpio endif - -include $(RIOTCPU)/efm32/Makefile.dep diff --git a/boards/ikea-tradfri/Makefile.features b/boards/ikea-tradfri/Makefile.features index 73d21f7a40..a869a893f9 100644 --- a/boards/ikea-tradfri/Makefile.features +++ b/boards/ikea-tradfri/Makefile.features @@ -1,3 +1,6 @@ +CPU = efm32 +CPU_MODEL = efr32mg1p132f256gm32 + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_gpio periph_gpio_irq FEATURES_PROVIDED += periph_rtc @@ -5,5 +8,3 @@ FEATURES_PROVIDED += periph_rtt FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart - -include $(RIOTCPU)/efm32/Makefile.features diff --git a/boards/ikea-tradfri/Makefile.include b/boards/ikea-tradfri/Makefile.include index b9d65b25c8..3d675eda29 100644 --- a/boards/ikea-tradfri/Makefile.include +++ b/boards/ikea-tradfri/Makefile.include @@ -1,7 +1,3 @@ -# define the cpu used by ikea-tradfri -export CPU = efm32 -export CPU_MODEL = efr32mg1p132f256gm32 - # set default port depending on operating system PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) diff --git a/boards/iotlab-a8-m3/Makefile.features b/boards/iotlab-a8-m3/Makefile.features index e3bcc4007e..c45201effb 100644 --- a/boards/iotlab-a8-m3/Makefile.features +++ b/boards/iotlab-a8-m3/Makefile.features @@ -1,3 +1 @@ include $(RIOTBOARD)/common/iotlab/Makefile.features - -include $(RIOTCPU)/stm32f1/Makefile.features diff --git a/boards/iotlab-m3/Makefile.features b/boards/iotlab-m3/Makefile.features index b5c4f50913..31a79d9da9 100644 --- a/boards/iotlab-m3/Makefile.features +++ b/boards/iotlab-m3/Makefile.features @@ -1,5 +1,3 @@ include $(RIOTBOARD)/common/iotlab/Makefile.features FEATURES_PROVIDED += periph_dma - -include $(RIOTCPU)/stm32f1/Makefile.features diff --git a/boards/jiminy-mega256rfr2/Makefile.features b/boards/jiminy-mega256rfr2/Makefile.features index 5ad360ac35..fd8b2bd2e9 100644 --- a/boards/jiminy-mega256rfr2/Makefile.features +++ b/boards/jiminy-mega256rfr2/Makefile.features @@ -1,8 +1,8 @@ +CPU = atmega256rfr2 + # This board is based on an atmega CPU, thus import the features from it include $(RIOTBOARD)/common/arduino-atmega/Makefile.features # Put defined MCU peripherals here (in alphabetical order) # Peripherals are defined in common/arduino-atmega/Makefile.features # Add only additional Peripherals - --include $(RIOTCPU)/atmega256rfr2/Makefile.features diff --git a/boards/jiminy-mega256rfr2/Makefile.include b/boards/jiminy-mega256rfr2/Makefile.include index 5806ad6ec0..82db943e5e 100644 --- a/boards/jiminy-mega256rfr2/Makefile.include +++ b/boards/jiminy-mega256rfr2/Makefile.include @@ -1,6 +1,3 @@ -# define the cpu used by the jiminy board -export CPU = atmega256rfr2 - # configure the terminal program PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) diff --git a/boards/limifrog-v1/Makefile.features b/boards/limifrog-v1/Makefile.features index dad5107fcd..dac624a150 100644 --- a/boards/limifrog-v1/Makefile.features +++ b/boards/limifrog-v1/Makefile.features @@ -1,7 +1,8 @@ +CPU = stm32l1 +CPU_MODEL = stm32l151rc + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart - -include $(RIOTCPU)/stm32l1/Makefile.features diff --git a/boards/limifrog-v1/Makefile.include b/boards/limifrog-v1/Makefile.include index c68a2e9fa6..8458a10af3 100644 --- a/boards/limifrog-v1/Makefile.include +++ b/boards/limifrog-v1/Makefile.include @@ -1,7 +1,3 @@ -## the cpu to build for -export CPU = stm32l1 -export CPU_MODEL = stm32l151rc - # define the default port depending on the host OS PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) diff --git a/boards/lobaro-lorabox/Makefile.features b/boards/lobaro-lorabox/Makefile.features index 361e850b47..60dbf65716 100644 --- a/boards/lobaro-lorabox/Makefile.features +++ b/boards/lobaro-lorabox/Makefile.features @@ -1,8 +1,9 @@ +CPU = stm32l1 +CPU_MODEL = stm32l151cb_a + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_rtc FEATURES_PROVIDED += periph_spi periph_spi_gpio_mode FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart - -include $(RIOTCPU)/stm32l1/Makefile.features diff --git a/boards/lobaro-lorabox/Makefile.include b/boards/lobaro-lorabox/Makefile.include index ab0bcab31d..136cf3034f 100644 --- a/boards/lobaro-lorabox/Makefile.include +++ b/boards/lobaro-lorabox/Makefile.include @@ -1,7 +1,3 @@ -## the cpu to build for -export CPU = stm32l1 -export CPU_MODEL = stm32l151cb_a - # add the common header files to the include path INCLUDES += -I$(RIOTBOARD)/common/stm32/include diff --git a/boards/lsn50/Makefile.features b/boards/lsn50/Makefile.features index 928593ed9c..2a98fd01ad 100644 --- a/boards/lsn50/Makefile.features +++ b/boards/lsn50/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32l0 +CPU_MODEL = stm32l072cz + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_dma FEATURES_PROVIDED += periph_i2c @@ -12,5 +15,3 @@ FEATURES_PROVIDED += periph_uart # The 0.10.0 openocd version in Ubuntu Bionic doesn't work. The change was # introduced after Jun 8, 2017 - v0.10.0-1-20170607-2132-dev. FEATURES_PROVIDED += riotboot - -include $(RIOTCPU)/stm32l0/Makefile.features diff --git a/boards/lsn50/Makefile.include b/boards/lsn50/Makefile.include index 84e196cb5c..3cb4ee060e 100644 --- a/boards/lsn50/Makefile.include +++ b/boards/lsn50/Makefile.include @@ -1,7 +1,3 @@ -## the cpu to build for -export CPU = stm32l0 -export CPU_MODEL = stm32l072cz - # we use shared STM32 configuration snippets INCLUDES += -I$(RIOTBOARD)/common/stm32/include diff --git a/boards/maple-mini/Makefile.features b/boards/maple-mini/Makefile.features index 0312cf1a6f..c252a10f2c 100644 --- a/boards/maple-mini/Makefile.features +++ b/boards/maple-mini/Makefile.features @@ -1,7 +1,8 @@ +CPU = stm32f1 +CPU_MODEL = stm32f103cb + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart - -include $(RIOTCPU)/stm32f1/Makefile.features diff --git a/boards/maple-mini/Makefile.include b/boards/maple-mini/Makefile.include index 9994096cf0..d39a097844 100644 --- a/boards/maple-mini/Makefile.include +++ b/boards/maple-mini/Makefile.include @@ -1,7 +1,3 @@ -# define the cpu used by the maple-mini board -export CPU = stm32f1 -export CPU_MODEL = stm32f103cb - # define the default port depending on the host OS PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) diff --git a/boards/mbed_lpc1768/Makefile.features b/boards/mbed_lpc1768/Makefile.features index 70c8d3d8a4..b25db8b0af 100644 --- a/boards/mbed_lpc1768/Makefile.features +++ b/boards/mbed_lpc1768/Makefile.features @@ -1,6 +1,6 @@ +CPU = lpc1768 + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_gpio periph_gpio_irq FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart - -include $(RIOTCPU)/lpc1768/Makefile.features diff --git a/boards/mbed_lpc1768/Makefile.include b/boards/mbed_lpc1768/Makefile.include index b490bb27b6..0263880157 100644 --- a/boards/mbed_lpc1768/Makefile.include +++ b/boards/mbed_lpc1768/Makefile.include @@ -1,6 +1,3 @@ -# define the cpu used by the mbed_lpx1768 board -export CPU = lpc1768 - FLASHER = $(RIOTBOARD)/$(BOARD)/dist/flash.sh DEBUGGER = DEBUGSERVER = diff --git a/boards/mega-xplained/Makefile.features b/boards/mega-xplained/Makefile.features index 56b3086778..773364582c 100644 --- a/boards/mega-xplained/Makefile.features +++ b/boards/mega-xplained/Makefile.features @@ -1,3 +1,5 @@ +CPU = atmega1284p + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_gpio periph_gpio_irq @@ -7,5 +9,3 @@ FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart # Various other features (if any) - --include $(RIOTCPU)/atmega1284p/Makefile.features diff --git a/boards/mega-xplained/Makefile.include b/boards/mega-xplained/Makefile.include index 228b9b2e30..0818aaf6de 100644 --- a/boards/mega-xplained/Makefile.include +++ b/boards/mega-xplained/Makefile.include @@ -1,6 +1,3 @@ -# define the cpu used by the Mega Xplained board -export CPU = atmega1284p - # Found by checking fuse settings (2048 words so 4KB) # https://www.microchip.com/DevelopmentTools/ProductDetails/atmega1284p-xpld BOOTLOADER_SIZE ?= 4K diff --git a/boards/microbit/Makefile.features b/boards/microbit/Makefile.features index e8d2c5b39d..d3414bcd83 100644 --- a/boards/microbit/Makefile.features +++ b/boards/microbit/Makefile.features @@ -1,3 +1,5 @@ +CPU_MODEL = nrf51x22xxab + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_uart diff --git a/boards/microbit/Makefile.include b/boards/microbit/Makefile.include index 3371ba06c5..ec6606b587 100644 --- a/boards/microbit/Makefile.include +++ b/boards/microbit/Makefile.include @@ -1,6 +1,3 @@ -# define the used CPU -export CPU_MODEL = nrf51x22xxab - # define the default port depending on the host OS PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) diff --git a/boards/msbiot/Makefile.features b/boards/msbiot/Makefile.features index 60633decef..cdb7339c34 100644 --- a/boards/msbiot/Makefile.features +++ b/boards/msbiot/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32f4 +CPU_MODEL = stm32f415rg + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_dac @@ -6,5 +9,3 @@ FEATURES_PROVIDED += periph_pwm FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart - -include $(RIOTCPU)/stm32f4/Makefile.features diff --git a/boards/msbiot/Makefile.include b/boards/msbiot/Makefile.include index f84deed7c6..1c458961da 100644 --- a/boards/msbiot/Makefile.include +++ b/boards/msbiot/Makefile.include @@ -1,7 +1,3 @@ -# define the cpu used by the msb-iot board -export CPU = stm32f4 -export CPU_MODEL = stm32f415rg - # we use shared STM32 configuration snippets INCLUDES += -I$(RIOTBOARD)/common/stm32/include diff --git a/boards/native/Makefile.features b/boards/native/Makefile.features index cad382b5cf..d0a5c35b1d 100644 --- a/boards/native/Makefile.features +++ b/boards/native/Makefile.features @@ -1,3 +1,5 @@ +CPU = native + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_rtc FEATURES_PROVIDED += periph_timer @@ -9,5 +11,3 @@ FEATURES_PROVIDED += periph_qdec # Various other features (if any) FEATURES_PROVIDED += ethernet FEATURES_PROVIDED += motor_driver - -include $(RIOTCPU)/native/Makefile.features diff --git a/boards/native/Makefile.include b/boards/native/Makefile.include index a1a6bf2e48..19ad94aae1 100644 --- a/boards/native/Makefile.include +++ b/boards/native/Makefile.include @@ -3,8 +3,6 @@ export NATIVEINCLUDES += -I$(RIOTBOARD)/$(BOARD)/include/ export NATIVEINCLUDES += -I$(RIOTBASE)/core/include/ export NATIVEINCLUDES += -I$(RIOTBASE)/drivers/include/ -export CPU = native - USEMODULE += native-drivers ifeq ($(shell uname -s),Darwin) diff --git a/boards/nrf51dk/Makefile.features b/boards/nrf51dk/Makefile.features index 94158d8eed..cfced8cd17 100644 --- a/boards/nrf51dk/Makefile.features +++ b/boards/nrf51dk/Makefile.features @@ -1,3 +1,5 @@ +CPU_MODEL = nrf51x22xxac + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_spi diff --git a/boards/nrf51dk/Makefile.include b/boards/nrf51dk/Makefile.include index 9ca97ae9cc..e92673947e 100644 --- a/boards/nrf51dk/Makefile.include +++ b/boards/nrf51dk/Makefile.include @@ -1,6 +1,3 @@ -# define the used CPU -export CPU_MODEL = nrf51x22xxac - # define the default port depending on the host OS PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) diff --git a/boards/nrf51dongle/Makefile.features b/boards/nrf51dongle/Makefile.features index 93dbc67187..f090f45bae 100644 --- a/boards/nrf51dongle/Makefile.features +++ b/boards/nrf51dongle/Makefile.features @@ -1,3 +1,5 @@ +CPU_MODEL = nrf51x22xxab + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_uart diff --git a/boards/nrf51dongle/Makefile.include b/boards/nrf51dongle/Makefile.include index 26796a8950..779a4cc62e 100644 --- a/boards/nrf51dongle/Makefile.include +++ b/boards/nrf51dongle/Makefile.include @@ -1,6 +1,3 @@ -# define the used CPU -export CPU_MODEL = nrf51x22xxab - # define the default port depending on the host OS PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) diff --git a/boards/nrf52832-mdk/Makefile.features b/boards/nrf52832-mdk/Makefile.features index ebfd151268..ebbf16569c 100644 --- a/boards/nrf52832-mdk/Makefile.features +++ b/boards/nrf52832-mdk/Makefile.features @@ -1,3 +1,5 @@ +CPU_MODEL = nrf52832xxaa + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_uart diff --git a/boards/nrf52832-mdk/Makefile.include b/boards/nrf52832-mdk/Makefile.include index e97d532344..e13aa13ed3 100644 --- a/boards/nrf52832-mdk/Makefile.include +++ b/boards/nrf52832-mdk/Makefile.include @@ -1,5 +1,3 @@ -export CPU_MODEL = nrf52832xxaa - # This board uses a DAP-Link programmer # Flashing support is provided through pyocd (default) and openocd. # For openocd, a version built against the development branch and containing diff --git a/boards/nrf52840-mdk/Makefile.features b/boards/nrf52840-mdk/Makefile.features index 72d4df5942..bb77f3ce1c 100644 --- a/boards/nrf52840-mdk/Makefile.features +++ b/boards/nrf52840-mdk/Makefile.features @@ -1,3 +1,5 @@ +CPU_MODEL = nrf52840xxaa + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_spi diff --git a/boards/nrf52840-mdk/Makefile.include b/boards/nrf52840-mdk/Makefile.include index c324b10a2c..507de6fbff 100644 --- a/boards/nrf52840-mdk/Makefile.include +++ b/boards/nrf52840-mdk/Makefile.include @@ -1,5 +1,3 @@ -export CPU_MODEL = nrf52840xxaa - # This board uses a DAP-Link programmer # Flashing support is provided through pyocd (default) and openocd. # For openocd, a version built against the development branch and containing diff --git a/boards/nrf52840dk/Makefile.features b/boards/nrf52840dk/Makefile.features index 9cd78c754f..e8dbe4a3dd 100644 --- a/boards/nrf52840dk/Makefile.features +++ b/boards/nrf52840dk/Makefile.features @@ -1,3 +1,5 @@ +CPU_MODEL = nrf52840xxaa + include $(RIOTBOARD)/common/nrf52xxxdk/Makefile.features # Various other features (if any) diff --git a/boards/nrf52840dk/Makefile.include b/boards/nrf52840dk/Makefile.include index b76f405a51..3829da8c5d 100644 --- a/boards/nrf52840dk/Makefile.include +++ b/boards/nrf52840dk/Makefile.include @@ -1,3 +1 @@ -export CPU_MODEL = nrf52840xxaa - include $(RIOTBOARD)/common/nrf52xxxdk/Makefile.include diff --git a/boards/nrf52dk/Makefile.features b/boards/nrf52dk/Makefile.features index 3c8d0f7503..81d1bddab0 100644 --- a/boards/nrf52dk/Makefile.features +++ b/boards/nrf52dk/Makefile.features @@ -1,2 +1,4 @@ +CPU_MODEL = nrf52832xxaa + include $(RIOTBOARD)/common/nrf52/Makefile.nrf52832.features include $(RIOTBOARD)/common/nrf52xxxdk/Makefile.features diff --git a/boards/nrf52dk/Makefile.include b/boards/nrf52dk/Makefile.include index 4aa5e47071..3829da8c5d 100644 --- a/boards/nrf52dk/Makefile.include +++ b/boards/nrf52dk/Makefile.include @@ -1,3 +1 @@ -export CPU_MODEL = nrf52832xxaa - include $(RIOTBOARD)/common/nrf52xxxdk/Makefile.include diff --git a/boards/nucleo-f030r8/Makefile.features b/boards/nucleo-f030r8/Makefile.features index 18d16957c0..25027d986d 100644 --- a/boards/nucleo-f030r8/Makefile.features +++ b/boards/nucleo-f030r8/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32f0 +CPU_MODEL = stm32f030r8 + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_pwm @@ -10,5 +13,3 @@ FEATURES_PROVIDED += periph_uart # load the common Makefile.features for Nucleo boards include $(RIOTBOARD)/common/nucleo64/Makefile.features - -include $(RIOTCPU)/stm32f0/Makefile.features diff --git a/boards/nucleo-f030r8/Makefile.include b/boards/nucleo-f030r8/Makefile.include index 81fbec2803..8db8eaed90 100644 --- a/boards/nucleo-f030r8/Makefile.include +++ b/boards/nucleo-f030r8/Makefile.include @@ -1,6 +1,2 @@ -## the cpu to build for -export CPU = stm32f0 -export CPU_MODEL = stm32f030r8 - # load the common Makefile.include for Nucleo boards include $(RIOTBOARD)/common/nucleo64/Makefile.include diff --git a/boards/nucleo-f031k6/Makefile.features b/boards/nucleo-f031k6/Makefile.features index 57af279800..fbbab12bb7 100644 --- a/boards/nucleo-f031k6/Makefile.features +++ b/boards/nucleo-f031k6/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32f0 +CPU_MODEL = stm32f031k6 + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_pwm @@ -8,5 +11,3 @@ FEATURES_PROVIDED += periph_uart # load the common Makefile.features for Nucleo-32 boards include $(RIOTBOARD)/common/nucleo32/Makefile.features - -include $(RIOTCPU)/stm32f0/Makefile.features diff --git a/boards/nucleo-f031k6/Makefile.include b/boards/nucleo-f031k6/Makefile.include index fc8437d2c2..f7dfb1e2a1 100644 --- a/boards/nucleo-f031k6/Makefile.include +++ b/boards/nucleo-f031k6/Makefile.include @@ -1,6 +1,2 @@ -## the cpu to build for -export CPU = stm32f0 -export CPU_MODEL = stm32f031k6 - # load the common Makefile.include for Nucleo-32 boards include $(RIOTBOARD)/common/nucleo32/Makefile.include diff --git a/boards/nucleo-f042k6/Makefile.features b/boards/nucleo-f042k6/Makefile.features index 57af279800..7fb79cdb62 100644 --- a/boards/nucleo-f042k6/Makefile.features +++ b/boards/nucleo-f042k6/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32f0 +CPU_MODEL = stm32f042k6 + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_pwm @@ -8,5 +11,3 @@ FEATURES_PROVIDED += periph_uart # load the common Makefile.features for Nucleo-32 boards include $(RIOTBOARD)/common/nucleo32/Makefile.features - -include $(RIOTCPU)/stm32f0/Makefile.features diff --git a/boards/nucleo-f042k6/Makefile.include b/boards/nucleo-f042k6/Makefile.include index 8b354ae30a..f7dfb1e2a1 100644 --- a/boards/nucleo-f042k6/Makefile.include +++ b/boards/nucleo-f042k6/Makefile.include @@ -1,6 +1,2 @@ -## the cpu to build for -export CPU = stm32f0 -export CPU_MODEL = stm32f042k6 - # load the common Makefile.include for Nucleo-32 boards include $(RIOTBOARD)/common/nucleo32/Makefile.include diff --git a/boards/nucleo-f070rb/Makefile.features b/boards/nucleo-f070rb/Makefile.features index fd182254ec..9b8eb2e756 100644 --- a/boards/nucleo-f070rb/Makefile.features +++ b/boards/nucleo-f070rb/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32f0 +CPU_MODEL = stm32f070rb + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_i2c @@ -11,5 +14,3 @@ FEATURES_PROVIDED += periph_uart # load the common Makefile.features for Nucleo boards include $(RIOTBOARD)/common/nucleo64/Makefile.features - -include $(RIOTCPU)/stm32f0/Makefile.features diff --git a/boards/nucleo-f070rb/Makefile.include b/boards/nucleo-f070rb/Makefile.include index ef931408a5..8db8eaed90 100644 --- a/boards/nucleo-f070rb/Makefile.include +++ b/boards/nucleo-f070rb/Makefile.include @@ -1,6 +1,2 @@ -## the cpu to build for -export CPU = stm32f0 -export CPU_MODEL = stm32f070rb - # load the common Makefile.include for Nucleo boards include $(RIOTBOARD)/common/nucleo64/Makefile.include diff --git a/boards/nucleo-f072rb/Makefile.features b/boards/nucleo-f072rb/Makefile.features index bddb69005c..64d24fd28b 100644 --- a/boards/nucleo-f072rb/Makefile.features +++ b/boards/nucleo-f072rb/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32f0 +CPU_MODEL = stm32f072rb + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_i2c @@ -12,5 +15,3 @@ FEATURES_PROVIDED += periph_spi # load the common Makefile.features for Nucleo boards include $(RIOTBOARD)/common/nucleo64/Makefile.features - -include $(RIOTCPU)/stm32f0/Makefile.features diff --git a/boards/nucleo-f072rb/Makefile.include b/boards/nucleo-f072rb/Makefile.include index dce7440ba8..8db8eaed90 100644 --- a/boards/nucleo-f072rb/Makefile.include +++ b/boards/nucleo-f072rb/Makefile.include @@ -1,6 +1,2 @@ -## the cpu to build for -export CPU = stm32f0 -export CPU_MODEL = stm32f072rb - # load the common Makefile.include for Nucleo boards include $(RIOTBOARD)/common/nucleo64/Makefile.include diff --git a/boards/nucleo-f091rc/Makefile.features b/boards/nucleo-f091rc/Makefile.features index 180a498c90..fbb68ef443 100644 --- a/boards/nucleo-f091rc/Makefile.features +++ b/boards/nucleo-f091rc/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32f0 +CPU_MODEL = stm32f091rc + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_dma @@ -13,5 +16,3 @@ FEATURES_PROVIDED += periph_spi # load the common Makefile.features for Nucleo boards include $(RIOTBOARD)/common/nucleo64/Makefile.features - -include $(RIOTCPU)/stm32f0/Makefile.features diff --git a/boards/nucleo-f091rc/Makefile.include b/boards/nucleo-f091rc/Makefile.include index 6c5fa32d9d..8db8eaed90 100644 --- a/boards/nucleo-f091rc/Makefile.include +++ b/boards/nucleo-f091rc/Makefile.include @@ -1,6 +1,2 @@ -## the cpu to build for -export CPU = stm32f0 -export CPU_MODEL = stm32f091rc - # load the common Makefile.include for Nucleo boards include $(RIOTBOARD)/common/nucleo64/Makefile.include diff --git a/boards/nucleo-f103rb/Makefile.features b/boards/nucleo-f103rb/Makefile.features index d28dcde371..fa97131f81 100644 --- a/boards/nucleo-f103rb/Makefile.features +++ b/boards/nucleo-f103rb/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32f1 +CPU_MODEL = stm32f103rb + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_rtt @@ -7,5 +10,3 @@ FEATURES_PROVIDED += periph_uart # load the common Makefile.features for Nucleo boards include $(RIOTBOARD)/common/nucleo64/Makefile.features - -include $(RIOTCPU)/stm32f1/Makefile.features diff --git a/boards/nucleo-f103rb/Makefile.include b/boards/nucleo-f103rb/Makefile.include index fde39f6fe4..8db8eaed90 100644 --- a/boards/nucleo-f103rb/Makefile.include +++ b/boards/nucleo-f103rb/Makefile.include @@ -1,6 +1,2 @@ -## the cpu to build for -export CPU = stm32f1 -export CPU_MODEL = stm32f103rb - # load the common Makefile.include for Nucleo boards include $(RIOTBOARD)/common/nucleo64/Makefile.include diff --git a/boards/nucleo-f207zg/Makefile.features b/boards/nucleo-f207zg/Makefile.features index 2fc72d7fbb..476f08f415 100644 --- a/boards/nucleo-f207zg/Makefile.features +++ b/boards/nucleo-f207zg/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32f2 +CPU_MODEL = stm32f207zg + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_dma FEATURES_PROVIDED += periph_i2c @@ -12,5 +15,3 @@ FEATURES_PROVIDED += riotboot # load the common Makefile.features for Nucleo-144 boards include $(RIOTBOARD)/common/nucleo144/Makefile.features - -include $(RIOTCPU)/stm32f2/Makefile.features diff --git a/boards/nucleo-f207zg/Makefile.include b/boards/nucleo-f207zg/Makefile.include index bd9a129dd7..471b5f80d6 100644 --- a/boards/nucleo-f207zg/Makefile.include +++ b/boards/nucleo-f207zg/Makefile.include @@ -1,6 +1,2 @@ -# define the cpu used by the nucleo-f207 board -export CPU = stm32f2 -export CPU_MODEL = stm32f207zg - # load the common Makefile.include for Nucleo-144 boards include $(RIOTBOARD)/common/nucleo144/Makefile.include diff --git a/boards/nucleo-f302r8/Makefile.features b/boards/nucleo-f302r8/Makefile.features index 535529cd8a..0f19af7e75 100644 --- a/boards/nucleo-f302r8/Makefile.features +++ b/boards/nucleo-f302r8/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32f3 +CPU_MODEL = stm32f302r8 + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_pwm @@ -11,5 +14,3 @@ FEATURES_PROVIDED += riotboot # load the common Makefile.features for Nucleo boards include $(RIOTBOARD)/common/nucleo64/Makefile.features - -include $(RIOTCPU)/stm32f3/Makefile.features diff --git a/boards/nucleo-f302r8/Makefile.include b/boards/nucleo-f302r8/Makefile.include index 017be69320..8db8eaed90 100644 --- a/boards/nucleo-f302r8/Makefile.include +++ b/boards/nucleo-f302r8/Makefile.include @@ -1,6 +1,2 @@ -# the cpu to build for -export CPU = stm32f3 -export CPU_MODEL = stm32f302r8 - # load the common Makefile.include for Nucleo boards include $(RIOTBOARD)/common/nucleo64/Makefile.include diff --git a/boards/nucleo-f303k8/Makefile.features b/boards/nucleo-f303k8/Makefile.features index 7106b82d42..58c8be5de3 100644 --- a/boards/nucleo-f303k8/Makefile.features +++ b/boards/nucleo-f303k8/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32f3 +CPU_MODEL = stm32f303k8 + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_pwm FEATURES_PROVIDED += periph_rtc @@ -10,5 +13,3 @@ FEATURES_PROVIDED += riotboot # load the common Makefile.features for Nucleo-32 boards include $(RIOTBOARD)/common/nucleo32/Makefile.features - -include $(RIOTCPU)/stm32f3/Makefile.features diff --git a/boards/nucleo-f303k8/Makefile.include b/boards/nucleo-f303k8/Makefile.include index d253288f3e..f7dfb1e2a1 100644 --- a/boards/nucleo-f303k8/Makefile.include +++ b/boards/nucleo-f303k8/Makefile.include @@ -1,6 +1,2 @@ -## the cpu to build for -export CPU = stm32f3 -export CPU_MODEL = stm32f303k8 - # load the common Makefile.include for Nucleo-32 boards include $(RIOTBOARD)/common/nucleo32/Makefile.include diff --git a/boards/nucleo-f303re/Makefile.features b/boards/nucleo-f303re/Makefile.features index 535529cd8a..879aa39301 100644 --- a/boards/nucleo-f303re/Makefile.features +++ b/boards/nucleo-f303re/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32f3 +CPU_MODEL = stm32f303re + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_pwm @@ -11,5 +14,3 @@ FEATURES_PROVIDED += riotboot # load the common Makefile.features for Nucleo boards include $(RIOTBOARD)/common/nucleo64/Makefile.features - -include $(RIOTCPU)/stm32f3/Makefile.features diff --git a/boards/nucleo-f303re/Makefile.include b/boards/nucleo-f303re/Makefile.include index 952f166d6d..8db8eaed90 100644 --- a/boards/nucleo-f303re/Makefile.include +++ b/boards/nucleo-f303re/Makefile.include @@ -1,6 +1,2 @@ -## the cpu to build for -export CPU = stm32f3 -export CPU_MODEL = stm32f303re - # load the common Makefile.include for Nucleo boards include $(RIOTBOARD)/common/nucleo64/Makefile.include diff --git a/boards/nucleo-f303ze/Makefile.features b/boards/nucleo-f303ze/Makefile.features index 767fd263bd..a9328a3792 100644 --- a/boards/nucleo-f303ze/Makefile.features +++ b/boards/nucleo-f303ze/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32f3 +CPU_MODEL = stm32f303ze + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_pwm FEATURES_PROVIDED += periph_rtc @@ -10,5 +13,3 @@ FEATURES_PROVIDED += riotboot # load the common Makefile.features for Nucleo 144 boards include $(RIOTBOARD)/common/nucleo144/Makefile.features - -include $(RIOTCPU)/stm32f3/Makefile.features diff --git a/boards/nucleo-f303ze/Makefile.include b/boards/nucleo-f303ze/Makefile.include index bd23453952..471b5f80d6 100644 --- a/boards/nucleo-f303ze/Makefile.include +++ b/boards/nucleo-f303ze/Makefile.include @@ -1,6 +1,2 @@ -# define the cpu used by the nucleo-f303ze board -export CPU = stm32f3 -export CPU_MODEL = stm32f303ze - # load the common Makefile.include for Nucleo-144 boards include $(RIOTBOARD)/common/nucleo144/Makefile.include diff --git a/boards/nucleo-f334r8/Makefile.features b/boards/nucleo-f334r8/Makefile.features index 722b604178..41b7497ff0 100644 --- a/boards/nucleo-f334r8/Makefile.features +++ b/boards/nucleo-f334r8/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32f3 +CPU_MODEL = stm32f334r8 + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_pwm FEATURES_PROVIDED += periph_rtc @@ -10,5 +13,3 @@ FEATURES_PROVIDED += riotboot # load the common Makefile.features for Nucleo boards include $(RIOTBOARD)/common/nucleo64/Makefile.features - -include $(RIOTCPU)/stm32f3/Makefile.features diff --git a/boards/nucleo-f334r8/Makefile.include b/boards/nucleo-f334r8/Makefile.include index 3d78f87e21..8db8eaed90 100644 --- a/boards/nucleo-f334r8/Makefile.include +++ b/boards/nucleo-f334r8/Makefile.include @@ -1,6 +1,2 @@ -## the cpu to build for -export CPU = stm32f3 -export CPU_MODEL = stm32f334r8 - # load the common Makefile.include for Nucleo boards include $(RIOTBOARD)/common/nucleo64/Makefile.include diff --git a/boards/nucleo-f401re/Makefile.features b/boards/nucleo-f401re/Makefile.features index 61abd70e3d..d97b3ffc8d 100644 --- a/boards/nucleo-f401re/Makefile.features +++ b/boards/nucleo-f401re/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32f4 +CPU_MODEL = stm32f401re + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_i2c @@ -10,5 +13,3 @@ FEATURES_PROVIDED += periph_qdec # load the common Makefile.features for Nucleo boards include $(RIOTBOARD)/common/nucleo64/Makefile.features - -include $(RIOTCPU)/stm32f4/Makefile.features diff --git a/boards/nucleo-f401re/Makefile.include b/boards/nucleo-f401re/Makefile.include index 77e0f0f69e..8db8eaed90 100644 --- a/boards/nucleo-f401re/Makefile.include +++ b/boards/nucleo-f401re/Makefile.include @@ -1,6 +1,2 @@ -# define the cpu used by the nucleo-f401re board -export CPU = stm32f4 -export CPU_MODEL = stm32f401re - # load the common Makefile.include for Nucleo boards include $(RIOTBOARD)/common/nucleo64/Makefile.include diff --git a/boards/nucleo-f410rb/Makefile.features b/boards/nucleo-f410rb/Makefile.features index 3a89cab3dd..cc91cd2a6f 100644 --- a/boards/nucleo-f410rb/Makefile.features +++ b/boards/nucleo-f410rb/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32f4 +CPU_MODEL = stm32f410rb + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_i2c @@ -5,5 +8,3 @@ FEATURES_PROVIDED += periph_rtc FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart - -include $(RIOTCPU)/stm32f4/Makefile.features diff --git a/boards/nucleo-f410rb/Makefile.include b/boards/nucleo-f410rb/Makefile.include index c2254d8012..8db8eaed90 100644 --- a/boards/nucleo-f410rb/Makefile.include +++ b/boards/nucleo-f410rb/Makefile.include @@ -1,6 +1,2 @@ -# define the cpu used by the nucleo-f401 board -export CPU = stm32f4 -export CPU_MODEL = stm32f410rb - # load the common Makefile.include for Nucleo boards include $(RIOTBOARD)/common/nucleo64/Makefile.include diff --git a/boards/nucleo-f411re/Makefile.features b/boards/nucleo-f411re/Makefile.features index 9741f0caed..0858936cca 100644 --- a/boards/nucleo-f411re/Makefile.features +++ b/boards/nucleo-f411re/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32f4 +CPU_MODEL = stm32f411re + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_i2c @@ -6,5 +9,3 @@ FEATURES_PROVIDED += periph_rtc FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart - -include $(RIOTCPU)/stm32f4/Makefile.features diff --git a/boards/nucleo-f411re/Makefile.include b/boards/nucleo-f411re/Makefile.include index 2bf49afce2..8db8eaed90 100644 --- a/boards/nucleo-f411re/Makefile.include +++ b/boards/nucleo-f411re/Makefile.include @@ -1,6 +1,2 @@ -# define the cpu used by the nucleo-f411re board -export CPU = stm32f4 -export CPU_MODEL = stm32f411re - # load the common Makefile.include for Nucleo boards include $(RIOTBOARD)/common/nucleo64/Makefile.include diff --git a/boards/nucleo-f412zg/Makefile.features b/boards/nucleo-f412zg/Makefile.features index 14e2d76843..128b38e895 100644 --- a/boards/nucleo-f412zg/Makefile.features +++ b/boards/nucleo-f412zg/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32f4 +CPU_MODEL = stm32f412zg + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_i2c @@ -9,5 +12,3 @@ FEATURES_PROVIDED += periph_uart # load the common Makefile.features for Nucleo-144 boards include $(RIOTBOARD)/common/nucleo144/Makefile.features - -include $(RIOTCPU)/stm32f4/Makefile.features diff --git a/boards/nucleo-f412zg/Makefile.include b/boards/nucleo-f412zg/Makefile.include index 95c504d567..471b5f80d6 100644 --- a/boards/nucleo-f412zg/Makefile.include +++ b/boards/nucleo-f412zg/Makefile.include @@ -1,6 +1,2 @@ -# define the cpu used by the nucleo-f412 board -export CPU = stm32f4 -export CPU_MODEL = stm32f412zg - # load the common Makefile.include for Nucleo-144 boards include $(RIOTBOARD)/common/nucleo144/Makefile.include diff --git a/boards/nucleo-f413zh/Makefile.features b/boards/nucleo-f413zh/Makefile.features index 1802b6b923..11e3cdab8f 100644 --- a/boards/nucleo-f413zh/Makefile.features +++ b/boards/nucleo-f413zh/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32f4 +CPU_MODEL = stm32f413zh + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_can @@ -12,5 +15,3 @@ FEATURES_PROVIDED += periph_uart # load the common Makefile.features for Nucleo boards include $(RIOTBOARD)/common/nucleo144/Makefile.features - -include $(RIOTCPU)/stm32f4/Makefile.features diff --git a/boards/nucleo-f413zh/Makefile.include b/boards/nucleo-f413zh/Makefile.include index 2c9bf06919..471b5f80d6 100644 --- a/boards/nucleo-f413zh/Makefile.include +++ b/boards/nucleo-f413zh/Makefile.include @@ -1,6 +1,2 @@ -# define the cpu used by the nucleo-f446 board -export CPU = stm32f4 -export CPU_MODEL = stm32f413zh - # load the common Makefile.include for Nucleo-144 boards include $(RIOTBOARD)/common/nucleo144/Makefile.include diff --git a/boards/nucleo-f429zi/Makefile.features b/boards/nucleo-f429zi/Makefile.features index 1c0dbc2a38..f67ac9bf03 100644 --- a/boards/nucleo-f429zi/Makefile.features +++ b/boards/nucleo-f429zi/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32f4 +CPU_MODEL = stm32f429zi + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_i2c @@ -9,5 +12,3 @@ FEATURES_PROVIDED += periph_uart # load the common Makefile.features for Nucleo boards include $(RIOTBOARD)/common/nucleo144/Makefile.features - -include $(RIOTCPU)/stm32f4/Makefile.features diff --git a/boards/nucleo-f429zi/Makefile.include b/boards/nucleo-f429zi/Makefile.include index 649cf9b8d7..471b5f80d6 100644 --- a/boards/nucleo-f429zi/Makefile.include +++ b/boards/nucleo-f429zi/Makefile.include @@ -1,6 +1,2 @@ -# define the cpu used by the nucleo-f429zi board -export CPU = stm32f4 -export CPU_MODEL = stm32f429zi - # load the common Makefile.include for Nucleo-144 boards include $(RIOTBOARD)/common/nucleo144/Makefile.include diff --git a/boards/nucleo-f446re/Makefile.features b/boards/nucleo-f446re/Makefile.features index fc96658a9c..f7ffa52d9d 100644 --- a/boards/nucleo-f446re/Makefile.features +++ b/boards/nucleo-f446re/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32f4 +CPU_MODEL = stm32f446re + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_i2c @@ -14,5 +17,3 @@ FEATURES_PROVIDED += riotboot # load the common Makefile.features for Nucleo boards include $(RIOTBOARD)/common/nucleo64/Makefile.features - -include $(RIOTCPU)/stm32f4/Makefile.features diff --git a/boards/nucleo-f446re/Makefile.include b/boards/nucleo-f446re/Makefile.include index dd16788fd9..8db8eaed90 100644 --- a/boards/nucleo-f446re/Makefile.include +++ b/boards/nucleo-f446re/Makefile.include @@ -1,6 +1,2 @@ -# define the cpu used by the nucleo-f446re board -export CPU = stm32f4 -export CPU_MODEL = stm32f446re - # load the common Makefile.include for Nucleo boards include $(RIOTBOARD)/common/nucleo64/Makefile.include diff --git a/boards/nucleo-f446ze/Makefile.features b/boards/nucleo-f446ze/Makefile.features index 79986708a1..e0fbb813d1 100644 --- a/boards/nucleo-f446ze/Makefile.features +++ b/boards/nucleo-f446ze/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32f4 +CPU_MODEL = stm32f446ze + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_pwm @@ -8,5 +11,3 @@ FEATURES_PROVIDED += periph_uart # load the common Makefile.features for Nucleo boards include $(RIOTBOARD)/common/nucleo144/Makefile.features - -include $(RIOTCPU)/stm32f4/Makefile.features diff --git a/boards/nucleo-f446ze/Makefile.include b/boards/nucleo-f446ze/Makefile.include index c5e96698c9..471b5f80d6 100644 --- a/boards/nucleo-f446ze/Makefile.include +++ b/boards/nucleo-f446ze/Makefile.include @@ -1,6 +1,2 @@ -# define the cpu used by the nucleo-f446ze board -export CPU = stm32f4 -export CPU_MODEL = stm32f446ze - # load the common Makefile.include for Nucleo-144 boards include $(RIOTBOARD)/common/nucleo144/Makefile.include diff --git a/boards/nucleo-f722ze/Makefile.features b/boards/nucleo-f722ze/Makefile.features index 450d4e45b8..48804fb1a4 100644 --- a/boards/nucleo-f722ze/Makefile.features +++ b/boards/nucleo-f722ze/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32f7 +CPU_MODEL = stm32f722ze + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_rtc @@ -10,5 +13,3 @@ FEATURES_PROVIDED += riotboot # load the common Makefile.features for Nucleo144 boards include $(RIOTBOARD)/common/nucleo144/Makefile.features - -include $(RIOTCPU)/stm32f7/Makefile.features diff --git a/boards/nucleo-f722ze/Makefile.include b/boards/nucleo-f722ze/Makefile.include index 4c59a5e1ed..71c01e2b93 100644 --- a/boards/nucleo-f722ze/Makefile.include +++ b/boards/nucleo-f722ze/Makefile.include @@ -1,6 +1,2 @@ -## the cpu to build for -export CPU = stm32f7 -export CPU_MODEL = stm32f722ze - # load the common Makefile.include for Nucleo144 boards include $(RIOTBOARD)/common/nucleo144/Makefile.include diff --git a/boards/nucleo-f746zg/Makefile.features b/boards/nucleo-f746zg/Makefile.features index e65470794b..23385d3dad 100644 --- a/boards/nucleo-f746zg/Makefile.features +++ b/boards/nucleo-f746zg/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32f7 +CPU_MODEL = stm32f746zg + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_rtc @@ -10,5 +13,3 @@ FEATURES_PROVIDED += riotboot # load the common Makefile.features for Nucleo boards include $(RIOTBOARD)/common/nucleo144/Makefile.features - -include $(RIOTCPU)/stm32f7/Makefile.features diff --git a/boards/nucleo-f746zg/Makefile.include b/boards/nucleo-f746zg/Makefile.include index 052e2be5dd..a7e3adb0d8 100644 --- a/boards/nucleo-f746zg/Makefile.include +++ b/boards/nucleo-f746zg/Makefile.include @@ -1,6 +1,2 @@ -## the cpu to build for -export CPU = stm32f7 -export CPU_MODEL = stm32f746zg - # load the common Makefile.include for Nucleo boards include $(RIOTBOARD)/common/nucleo144/Makefile.include diff --git a/boards/nucleo-f767zi/Makefile.features b/boards/nucleo-f767zi/Makefile.features index b6502bf998..3ed5517e5d 100644 --- a/boards/nucleo-f767zi/Makefile.features +++ b/boards/nucleo-f767zi/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32f7 +CPU_MODEL = stm32f767zi + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_dma FEATURES_PROVIDED += periph_i2c @@ -13,5 +16,3 @@ FEATURES_PROVIDED += riotboot # load the common Makefile.features for Nucleo boards include $(RIOTBOARD)/common/nucleo144/Makefile.features - -include $(RIOTCPU)/stm32f7/Makefile.features diff --git a/boards/nucleo-f767zi/Makefile.include b/boards/nucleo-f767zi/Makefile.include index fc967abf5e..a7e3adb0d8 100644 --- a/boards/nucleo-f767zi/Makefile.include +++ b/boards/nucleo-f767zi/Makefile.include @@ -1,6 +1,2 @@ -## the cpu to build for -export CPU = stm32f7 -export CPU_MODEL = stm32f767zi - # load the common Makefile.include for Nucleo boards include $(RIOTBOARD)/common/nucleo144/Makefile.include diff --git a/boards/nucleo-l031k6/Makefile.features b/boards/nucleo-l031k6/Makefile.features index 384b8b747e..60213db641 100644 --- a/boards/nucleo-l031k6/Makefile.features +++ b/boards/nucleo-l031k6/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32l0 +CPU_MODEL = stm32l031k6 + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_pwm @@ -9,5 +12,3 @@ FEATURES_PROVIDED += periph_uart # load the common Makefile.features for Nucleo-32 boards include $(RIOTBOARD)/common/nucleo32/Makefile.features - -include $(RIOTCPU)/stm32l0/Makefile.features diff --git a/boards/nucleo-l031k6/Makefile.include b/boards/nucleo-l031k6/Makefile.include index 24587304da..f7dfb1e2a1 100644 --- a/boards/nucleo-l031k6/Makefile.include +++ b/boards/nucleo-l031k6/Makefile.include @@ -1,6 +1,2 @@ -## the cpu to build for -export CPU = stm32l0 -export CPU_MODEL = stm32l031k6 - # load the common Makefile.include for Nucleo-32 boards include $(RIOTBOARD)/common/nucleo32/Makefile.include diff --git a/boards/nucleo-l053r8/Makefile.features b/boards/nucleo-l053r8/Makefile.features index 85a8767899..3437f7c82c 100644 --- a/boards/nucleo-l053r8/Makefile.features +++ b/boards/nucleo-l053r8/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32l0 +CPU_MODEL = stm32l053r8 + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_pwm FEATURES_PROVIDED += periph_rtc @@ -8,5 +11,3 @@ FEATURES_PROVIDED += periph_uart # load the common Makefile.features for Nucleo boards include $(RIOTBOARD)/common/nucleo64/Makefile.features - -include $(RIOTCPU)/stm32l0/Makefile.features diff --git a/boards/nucleo-l053r8/Makefile.include b/boards/nucleo-l053r8/Makefile.include index d1e1ee470e..8db8eaed90 100644 --- a/boards/nucleo-l053r8/Makefile.include +++ b/boards/nucleo-l053r8/Makefile.include @@ -1,6 +1,2 @@ -## the cpu to build for -export CPU = stm32l0 -export CPU_MODEL = stm32l053r8 - # load the common Makefile.include for Nucleo boards include $(RIOTBOARD)/common/nucleo64/Makefile.include diff --git a/boards/nucleo-l073rz/Makefile.features b/boards/nucleo-l073rz/Makefile.features index afb868391a..e75ee2a2db 100644 --- a/boards/nucleo-l073rz/Makefile.features +++ b/boards/nucleo-l073rz/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32l0 +CPU_MODEL = stm32l073rz + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_i2c @@ -17,5 +20,3 @@ FEATURES_PROVIDED += riotboot # load the common Makefile.features for Nucleo boards include $(RIOTBOARD)/common/nucleo64/Makefile.features - -include $(RIOTCPU)/stm32l0/Makefile.features diff --git a/boards/nucleo-l073rz/Makefile.include b/boards/nucleo-l073rz/Makefile.include index 4e7785f38c..8db8eaed90 100644 --- a/boards/nucleo-l073rz/Makefile.include +++ b/boards/nucleo-l073rz/Makefile.include @@ -1,6 +1,2 @@ -## the cpu to build for -export CPU = stm32l0 -export CPU_MODEL = stm32l073rz - # load the common Makefile.include for Nucleo boards include $(RIOTBOARD)/common/nucleo64/Makefile.include diff --git a/boards/nucleo-l152re/Makefile.features b/boards/nucleo-l152re/Makefile.features index 7bb14e0ddc..914de8eb87 100644 --- a/boards/nucleo-l152re/Makefile.features +++ b/boards/nucleo-l152re/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32l1 +CPU_MODEL = stm32l152re + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_dac @@ -14,5 +17,3 @@ FEATURES_PROVIDED += riotboot # load the common Makefile.features for Nucleo boards include $(RIOTBOARD)/common/nucleo64/Makefile.features - -include $(RIOTCPU)/stm32l1/Makefile.features diff --git a/boards/nucleo-l152re/Makefile.include b/boards/nucleo-l152re/Makefile.include index f949c2f6d6..8db8eaed90 100644 --- a/boards/nucleo-l152re/Makefile.include +++ b/boards/nucleo-l152re/Makefile.include @@ -1,6 +1,2 @@ -## the cpu to build for -export CPU = stm32l1 -export CPU_MODEL = stm32l152re - # load the common Makefile.include for Nucleo boards include $(RIOTBOARD)/common/nucleo64/Makefile.include diff --git a/boards/nucleo-l432kc/Makefile.features b/boards/nucleo-l432kc/Makefile.features index 93ca929528..89adf508d5 100644 --- a/boards/nucleo-l432kc/Makefile.features +++ b/boards/nucleo-l432kc/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32l4 +CPU_MODEL = stm32l432kc + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_pwm FEATURES_PROVIDED += periph_rtc @@ -15,5 +18,3 @@ FEATURES_PROVIDED += riotboot # load the common Makefile.features for Nucleo-32 boards include $(RIOTBOARD)/common/nucleo32/Makefile.features - -include $(RIOTCPU)/stm32l4/Makefile.features diff --git a/boards/nucleo-l432kc/Makefile.include b/boards/nucleo-l432kc/Makefile.include index e3e505bc8c..f7dfb1e2a1 100644 --- a/boards/nucleo-l432kc/Makefile.include +++ b/boards/nucleo-l432kc/Makefile.include @@ -1,6 +1,2 @@ -## the cpu to build for -export CPU = stm32l4 -export CPU_MODEL = stm32l432kc - # load the common Makefile.include for Nucleo-32 boards include $(RIOTBOARD)/common/nucleo32/Makefile.include diff --git a/boards/nucleo-l433rc/Makefile.features b/boards/nucleo-l433rc/Makefile.features index 67fa9d6357..8ae27f7821 100644 --- a/boards/nucleo-l433rc/Makefile.features +++ b/boards/nucleo-l433rc/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32l4 +CPU_MODEL = stm32l433rc + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_lpuart @@ -17,5 +20,3 @@ FEATURES_PROVIDED += riotboot # load the common Makefile.features for Nucleo boards include $(RIOTBOARD)/common/nucleo64/Makefile.features - -include $(RIOTCPU)/stm32l4/Makefile.features diff --git a/boards/nucleo-l433rc/Makefile.include b/boards/nucleo-l433rc/Makefile.include index 9c2743b776..8db8eaed90 100644 --- a/boards/nucleo-l433rc/Makefile.include +++ b/boards/nucleo-l433rc/Makefile.include @@ -1,6 +1,2 @@ -## the cpu to build for -export CPU = stm32l4 -export CPU_MODEL = stm32l433rc - # load the common Makefile.include for Nucleo boards include $(RIOTBOARD)/common/nucleo64/Makefile.include diff --git a/boards/nucleo-l452re/Makefile.features b/boards/nucleo-l452re/Makefile.features index 38a92a3011..ef2df76c48 100644 --- a/boards/nucleo-l452re/Makefile.features +++ b/boards/nucleo-l452re/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32l4 +CPU_MODEL = stm32l452re + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_pwm FEATURES_PROVIDED += periph_rtc @@ -11,5 +14,3 @@ FEATURES_PROVIDED += riotboot # load the common Makefile.features for Nucleo boards include $(RIOTBOARD)/common/nucleo64/Makefile.features - -include $(RIOTCPU)/stm32l4/Makefile.features diff --git a/boards/nucleo-l452re/Makefile.include b/boards/nucleo-l452re/Makefile.include index b820a2b80f..8db8eaed90 100644 --- a/boards/nucleo-l452re/Makefile.include +++ b/boards/nucleo-l452re/Makefile.include @@ -1,6 +1,2 @@ -## the cpu to build for -export CPU = stm32l4 -export CPU_MODEL = stm32l452re - # load the common Makefile.include for Nucleo boards include $(RIOTBOARD)/common/nucleo64/Makefile.include diff --git a/boards/nucleo-l476rg/Makefile.features b/boards/nucleo-l476rg/Makefile.features index 5167cf5f44..b61dd0e29b 100644 --- a/boards/nucleo-l476rg/Makefile.features +++ b/boards/nucleo-l476rg/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32l4 +CPU_MODEL = stm32l476rg + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_dma @@ -14,5 +17,3 @@ FEATURES_PROVIDED += riotboot # load the common Makefile.features for Nucleo boards include $(RIOTBOARD)/common/nucleo64/Makefile.features - -include $(RIOTCPU)/stm32l4/Makefile.features diff --git a/boards/nucleo-l476rg/Makefile.include b/boards/nucleo-l476rg/Makefile.include index 1812cb94ad..8db8eaed90 100644 --- a/boards/nucleo-l476rg/Makefile.include +++ b/boards/nucleo-l476rg/Makefile.include @@ -1,6 +1,2 @@ -## the cpu to build for -export CPU = stm32l4 -export CPU_MODEL = stm32l476rg - # load the common Makefile.include for Nucleo boards include $(RIOTBOARD)/common/nucleo64/Makefile.include diff --git a/boards/nucleo-l496zg/Makefile.features b/boards/nucleo-l496zg/Makefile.features index c9f7e067f8..f552003568 100644 --- a/boards/nucleo-l496zg/Makefile.features +++ b/boards/nucleo-l496zg/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32l4 +CPU_MODEL = stm32l496zg + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_pwm @@ -12,5 +15,3 @@ FEATURES_PROVIDED += riotboot # load the common Makefile.features for Nucleo boards include $(RIOTBOARD)/common/nucleo144/Makefile.features - -include $(RIOTCPU)/stm32l4/Makefile.features diff --git a/boards/nucleo-l496zg/Makefile.include b/boards/nucleo-l496zg/Makefile.include index 51050cea5b..bdc9e713f5 100644 --- a/boards/nucleo-l496zg/Makefile.include +++ b/boards/nucleo-l496zg/Makefile.include @@ -1,7 +1,3 @@ -## the cpu to build for -export CPU = stm32l4 -export CPU_MODEL = stm32l496zg - # stdio is not available over st-link but on the Arduino TX/RX pins # A serial to USB converter plugged to the host is required PORT_LINUX ?= /dev/ttyACM0 diff --git a/boards/nucleo-l4r5zi/Makefile.features b/boards/nucleo-l4r5zi/Makefile.features index 7049d3fc2b..1081479275 100644 --- a/boards/nucleo-l4r5zi/Makefile.features +++ b/boards/nucleo-l4r5zi/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32l4 +CPU_MODEL = stm32l4r5zi + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_lpuart @@ -12,5 +15,3 @@ FEATURES_PROVIDED += riotboot # load the common Makefile.features for Nucleo boards include $(RIOTBOARD)/common/nucleo144/Makefile.features - --include $(RIOTCPU)/stm32l4/Makefile.features diff --git a/boards/nucleo-l4r5zi/Makefile.include b/boards/nucleo-l4r5zi/Makefile.include index 97659f962a..f4e68472a8 100644 --- a/boards/nucleo-l4r5zi/Makefile.include +++ b/boards/nucleo-l4r5zi/Makefile.include @@ -1,7 +1,3 @@ -## the cpu to build for -export CPU = stm32l4 -export CPU_MODEL = stm32l4r5zi - # stdio is available over st-link PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) diff --git a/boards/nz32-sc151/Makefile.features b/boards/nz32-sc151/Makefile.features index 5a30f15fe9..24687d79f4 100644 --- a/boards/nz32-sc151/Makefile.features +++ b/boards/nz32-sc151/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32l1 +CPU_MODEL = stm32l151rc + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_dac @@ -7,5 +10,3 @@ FEATURES_PROVIDED += periph_rtc FEATURES_PROVIDED += periph_spi periph_spi_gpio_mode FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart - -include $(RIOTCPU)/stm32l1/Makefile.features diff --git a/boards/nz32-sc151/Makefile.include b/boards/nz32-sc151/Makefile.include index 2934e3c2fc..e63ff4c851 100644 --- a/boards/nz32-sc151/Makefile.include +++ b/boards/nz32-sc151/Makefile.include @@ -1,7 +1,3 @@ -## the cpu to build for -export CPU = stm32l1 -export CPU_MODEL = stm32l151rc - # we use shared STM32 configuration snippets INCLUDES += -I$(RIOTBOARD)/common/stm32/include diff --git a/boards/opencm904/Makefile.features b/boards/opencm904/Makefile.features index 563b364449..dc8c10468c 100644 --- a/boards/opencm904/Makefile.features +++ b/boards/opencm904/Makefile.features @@ -1,5 +1,6 @@ +CPU = stm32f1 +CPU_MODEL = stm32f103cb + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart - -include $(RIOTCPU)/stm32f1/Makefile.features diff --git a/boards/opencm904/Makefile.include b/boards/opencm904/Makefile.include index 5a535a49fc..f45764a0df 100644 --- a/boards/opencm904/Makefile.include +++ b/boards/opencm904/Makefile.include @@ -1,7 +1,3 @@ -# the cpu to build for -export CPU = stm32f1 -export CPU_MODEL = stm32f103cb - # custom flasher to use with the bootloader FLASHER = $(RIOTBOARD)/$(BOARD)/dist/robotis-loader.py DEBUGGER = diff --git a/boards/openmote-b/Makefile.features b/boards/openmote-b/Makefile.features index a150607391..65492a0bd1 100644 --- a/boards/openmote-b/Makefile.features +++ b/boards/openmote-b/Makefile.features @@ -1,3 +1,6 @@ +CPU = cc2538 +CPU_MODEL = cc2538sf53 + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_gpio periph_gpio_irq @@ -5,5 +8,3 @@ FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart - -include $(RIOTCPU)/cc2538/Makefile.features diff --git a/boards/openmote-b/Makefile.include b/boards/openmote-b/Makefile.include index cea18f1ea7..d1c835b127 100644 --- a/boards/openmote-b/Makefile.include +++ b/boards/openmote-b/Makefile.include @@ -1,7 +1,3 @@ -# define the cpu used by the OpenMote-B board -export CPU = cc2538 -export CPU_MODEL = cc2538sf53 - # define the default port depending on the host OS PORT_LINUX ?= /dev/ttyUSB1 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbserial*))) diff --git a/boards/openmote-cc2538/Makefile.features b/boards/openmote-cc2538/Makefile.features index 07fde60b04..2664ebb454 100644 --- a/boards/openmote-cc2538/Makefile.features +++ b/boards/openmote-cc2538/Makefile.features @@ -1,3 +1,6 @@ +CPU = cc2538 +CPU_MODEL = cc2538sf53 + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_gpio periph_gpio_irq FEATURES_PROVIDED += periph_i2c @@ -5,5 +8,3 @@ FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += periph_adc - -include $(RIOTCPU)/cc2538/Makefile.features diff --git a/boards/openmote-cc2538/Makefile.include b/boards/openmote-cc2538/Makefile.include index d77f06b787..26e9e1f1c1 100644 --- a/boards/openmote-cc2538/Makefile.include +++ b/boards/openmote-cc2538/Makefile.include @@ -1,7 +1,3 @@ -# define the cpu used by the OpenMote-cc2538 board -export CPU = cc2538 -export CPU_MODEL = cc2538sf53 - # define the default port depending on the host OS PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbserial*))) diff --git a/boards/pba-d-01-kw2x/Makefile.dep b/boards/pba-d-01-kw2x/Makefile.dep index d35a2e11ea..0e28cc9908 100644 --- a/boards/pba-d-01-kw2x/Makefile.dep +++ b/boards/pba-d-01-kw2x/Makefile.dep @@ -11,5 +11,3 @@ ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += tcs37727 USEMODULE += tmp006 endif - -include $(RIOTCPU)/kinetis/Makefile.dep diff --git a/boards/pba-d-01-kw2x/Makefile.features b/boards/pba-d-01-kw2x/Makefile.features index a59de76bd0..6e457f3120 100644 --- a/boards/pba-d-01-kw2x/Makefile.features +++ b/boards/pba-d-01-kw2x/Makefile.features @@ -1,3 +1,9 @@ +CPU = kinetis +# the pba-d-01-kw2x board can embed either a kw21d256, kw21d512 or kw22d512 cpu. +# The default set up is kw21d256, the variable is overrideable to use the other +# cpu if needed. +CPU_MODEL ?= mkw21d256vha5 + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_i2c @@ -10,5 +16,3 @@ FEATURES_PROVIDED += periph_uart # Put other features for this board (in alphabetical order) FEATURES_PROVIDED += riotboot - -include $(RIOTCPU)/kinetis/Makefile.features diff --git a/boards/pba-d-01-kw2x/Makefile.include b/boards/pba-d-01-kw2x/Makefile.include index 0630575241..a98603a903 100644 --- a/boards/pba-d-01-kw2x/Makefile.include +++ b/boards/pba-d-01-kw2x/Makefile.include @@ -1,11 +1,3 @@ -# define the cpu used by the phyWAVE-KW22 board -export CPU = kinetis - -# the pba-d-01-kw2x board can embed either a kw21d256, kw21d512 or kw22d512 cpu. -# The default set up is kw21d256, the variable is overrideable to use the other -# cpu if needed. -export CPU_MODEL ?= mkw21d256vha5 - # set default port depending on operating system PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) diff --git a/boards/pyboard/Makefile.features b/boards/pyboard/Makefile.features index caa5693e9b..e2a8fd95a7 100644 --- a/boards/pyboard/Makefile.features +++ b/boards/pyboard/Makefile.features @@ -1,8 +1,9 @@ +CPU = stm32f4 +CPU_MODEL = stm32f405rg + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_rtc FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart - -include $(RIOTCPU)/stm32f4/Makefile.features diff --git a/boards/pyboard/Makefile.include b/boards/pyboard/Makefile.include index 5b2742f43e..57c0f9c079 100644 --- a/boards/pyboard/Makefile.include +++ b/boards/pyboard/Makefile.include @@ -1,7 +1,3 @@ -# the cpu to build for -export CPU = stm32f4 -export CPU_MODEL = stm32f405rg - # define the default port depending on the host OS PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) diff --git a/boards/reel/Makefile.features b/boards/reel/Makefile.features index 490b645123..c690d4c639 100644 --- a/boards/reel/Makefile.features +++ b/boards/reel/Makefile.features @@ -1,3 +1,5 @@ +CPU_MODEL = nrf52840xxaa + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_spi diff --git a/boards/reel/Makefile.include b/boards/reel/Makefile.include index 35d836c502..95037eae39 100644 --- a/boards/reel/Makefile.include +++ b/boards/reel/Makefile.include @@ -1,6 +1,3 @@ -# specific CPU model used -CPU_MODEL = nrf52840xxaa - # set programming environment DEBUG_ADAPTER ?= dap PROGRAMMER ?= openocd diff --git a/boards/ruuvitag/Makefile.features b/boards/ruuvitag/Makefile.features index a50e192646..b82ac58599 100644 --- a/boards/ruuvitag/Makefile.features +++ b/boards/ruuvitag/Makefile.features @@ -1,3 +1,5 @@ +CPU_MODEL = nrf52832xxaa + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_uart diff --git a/boards/ruuvitag/Makefile.include b/boards/ruuvitag/Makefile.include index eb284c27fc..3eae148e81 100644 --- a/boards/ruuvitag/Makefile.include +++ b/boards/ruuvitag/Makefile.include @@ -1,6 +1,3 @@ -# CPU configuration -CPU_MODEL = nrf52832xxaa - # for this board, we are using Segger's RTT as default terminal interface USEMODULE += stdio_rtt TERMPROG = $(RIOTTOOLS)/jlink/jlink.sh diff --git a/boards/samd21-xpro/Makefile.features b/boards/samd21-xpro/Makefile.features index 76cf64d9f8..27a8b83bb7 100644 --- a/boards/samd21-xpro/Makefile.features +++ b/boards/samd21-xpro/Makefile.features @@ -1,3 +1,6 @@ +CPU = samd21 +CPU_MODEL = samd21j18a + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_i2c @@ -7,5 +10,3 @@ FEATURES_PROVIDED += periph_rtt FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart - -include $(RIOTCPU)/samd21/Makefile.features diff --git a/boards/samd21-xpro/Makefile.include b/boards/samd21-xpro/Makefile.include index 427ba1fb7d..f4f23e1b66 100644 --- a/boards/samd21-xpro/Makefile.include +++ b/boards/samd21-xpro/Makefile.include @@ -1,7 +1,3 @@ -# define the cpu used by SAMD21 Xplained Pro board -export CPU = samd21 -export CPU_MODEL = samd21j18a - # set edbg device type EDBG_DEVICE_TYPE = atmel_cm0p diff --git a/boards/same54-xpro/Makefile.features b/boards/same54-xpro/Makefile.features index 32bc45a17c..91cb9db73b 100644 --- a/boards/same54-xpro/Makefile.features +++ b/boards/same54-xpro/Makefile.features @@ -1,3 +1,6 @@ +CPU = samd5x +CPU_MODEL = same54p20a + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_rtc @@ -9,5 +12,3 @@ FEATURES_PROVIDED += periph_usbdev # Put other features for this board (in alphabetical order) FEATURES_PROVIDED += riotboot - -include $(RIOTCPU)/samd5x/Makefile.features diff --git a/boards/same54-xpro/Makefile.include b/boards/same54-xpro/Makefile.include index f2758553da..0583b3af49 100644 --- a/boards/same54-xpro/Makefile.include +++ b/boards/same54-xpro/Makefile.include @@ -1,7 +1,3 @@ -# define the cpu used by SAME54 Xplained Pro board -export CPU = samd5x -export CPU_MODEL = same54p20a - # set edbg device type EDBG_DEVICE_TYPE = atmel_cm4v2 diff --git a/boards/saml10-xpro/Makefile.features b/boards/saml10-xpro/Makefile.features index daae835a23..ad57a9a8dc 100644 --- a/boards/saml10-xpro/Makefile.features +++ b/boards/saml10-xpro/Makefile.features @@ -1 +1,3 @@ +CPU_MODEL = saml10e16a + include $(RIOTBOARD)/common/saml1x/Makefile.features diff --git a/boards/saml10-xpro/Makefile.include b/boards/saml10-xpro/Makefile.include index 16a729339d..34d32c3383 100644 --- a/boards/saml10-xpro/Makefile.include +++ b/boards/saml10-xpro/Makefile.include @@ -1,5 +1,4 @@ export CPU_FAM = saml10 -export CPU_MODEL = saml10e16a export CFLAGS += -D__SAML10E16A__ include $(RIOTBOARD)/common/saml1x/Makefile.include diff --git a/boards/saml11-xpro/Makefile.features b/boards/saml11-xpro/Makefile.features index daae835a23..31b202ee23 100644 --- a/boards/saml11-xpro/Makefile.features +++ b/boards/saml11-xpro/Makefile.features @@ -1 +1,3 @@ +CPU_MODEL = saml11e16a + include $(RIOTBOARD)/common/saml1x/Makefile.features diff --git a/boards/saml11-xpro/Makefile.include b/boards/saml11-xpro/Makefile.include index 78229c3ebd..59e407b0e1 100644 --- a/boards/saml11-xpro/Makefile.include +++ b/boards/saml11-xpro/Makefile.include @@ -1,5 +1,4 @@ export CPU_FAM = saml11 -export CPU_MODEL = saml11e16a export CFLAGS += -D__SAML11E16A__ include $(RIOTBOARD)/common/saml1x/Makefile.include diff --git a/boards/saml21-xpro/Makefile.features b/boards/saml21-xpro/Makefile.features index 53cbc69672..9058687072 100644 --- a/boards/saml21-xpro/Makefile.features +++ b/boards/saml21-xpro/Makefile.features @@ -1,3 +1,6 @@ +CPU = saml21 +CPU_MODEL = saml21j18a + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_i2c @@ -9,5 +12,3 @@ FEATURES_PROVIDED += periph_uart # Put other features for this board (in alphabetical order) FEATURES_PROVIDED += riotboot - -include $(RIOTCPU)/saml21/Makefile.features diff --git a/boards/saml21-xpro/Makefile.include b/boards/saml21-xpro/Makefile.include index 376a76d728..4ccc713f7d 100644 --- a/boards/saml21-xpro/Makefile.include +++ b/boards/saml21-xpro/Makefile.include @@ -1,6 +1,3 @@ -# define the cpu used by the saml21 board -export CPU = saml21 -export CPU_MODEL = saml21j18a export CFLAGS += -D__SAML21J18A__ # set edbg device type diff --git a/boards/samr21-xpro/Makefile.features b/boards/samr21-xpro/Makefile.features index 3d705f5d1d..3fb3bb44eb 100644 --- a/boards/samr21-xpro/Makefile.features +++ b/boards/samr21-xpro/Makefile.features @@ -1,3 +1,6 @@ +CPU = samd21 +CPU_MODEL = samr21g18a + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_i2c @@ -11,5 +14,3 @@ FEATURES_PROVIDED += periph_usbdev # Put other features for this board (in alphabetical order) FEATURES_PROVIDED += riotboot - -include $(RIOTCPU)/samd21/Makefile.features diff --git a/boards/samr21-xpro/Makefile.include b/boards/samr21-xpro/Makefile.include index ba753cc0a9..f4f23e1b66 100644 --- a/boards/samr21-xpro/Makefile.include +++ b/boards/samr21-xpro/Makefile.include @@ -1,7 +1,3 @@ -# define the cpu used by SAMR21 Xplained Pro board -export CPU = samd21 -export CPU_MODEL = samr21g18a - # set edbg device type EDBG_DEVICE_TYPE = atmel_cm0p diff --git a/boards/samr30-xpro/Makefile.features b/boards/samr30-xpro/Makefile.features index e077a1680e..2544b93da8 100644 --- a/boards/samr30-xpro/Makefile.features +++ b/boards/samr30-xpro/Makefile.features @@ -1,3 +1,6 @@ +CPU = saml21 +CPU_MODEL = samr30g18a + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_i2c @@ -6,6 +9,3 @@ FEATURES_PROVIDED += periph_rtt FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart - -# samr30 is a specific flavor of saml21 -include $(RIOTCPU)/saml21/Makefile.features diff --git a/boards/samr30-xpro/Makefile.include b/boards/samr30-xpro/Makefile.include index b9d27bd5b1..f4f23e1b66 100644 --- a/boards/samr30-xpro/Makefile.include +++ b/boards/samr30-xpro/Makefile.include @@ -1,7 +1,3 @@ -# define the cpu used by the samr30-xpro board (based on saml21) -export CPU = saml21 -export CPU_MODEL = samr30g18a - # set edbg device type EDBG_DEVICE_TYPE = atmel_cm0p diff --git a/boards/seeeduino_arch-pro/Makefile.features b/boards/seeeduino_arch-pro/Makefile.features index 70c8d3d8a4..b25db8b0af 100644 --- a/boards/seeeduino_arch-pro/Makefile.features +++ b/boards/seeeduino_arch-pro/Makefile.features @@ -1,6 +1,6 @@ +CPU = lpc1768 + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_gpio periph_gpio_irq FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart - -include $(RIOTCPU)/lpc1768/Makefile.features diff --git a/boards/seeeduino_arch-pro/Makefile.include b/boards/seeeduino_arch-pro/Makefile.include index 3ed4dbf9e0..189bc8b8db 100644 --- a/boards/seeeduino_arch-pro/Makefile.include +++ b/boards/seeeduino_arch-pro/Makefile.include @@ -1,6 +1,3 @@ -# define the used CPU -export CPU = lpc1768 - # define the default port depending on the host OS PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) diff --git a/boards/sensebox_samd21/Makefile.features b/boards/sensebox_samd21/Makefile.features index fbf6667e81..df6f5c09f4 100644 --- a/boards/sensebox_samd21/Makefile.features +++ b/boards/sensebox_samd21/Makefile.features @@ -1,3 +1,6 @@ +CPU = samd21 +CPU_MODEL = samd21g18a + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_i2c @@ -6,5 +9,3 @@ FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += periph_usbdev - -include $(RIOTCPU)/samd21/Makefile.features diff --git a/boards/sensebox_samd21/Makefile.include b/boards/sensebox_samd21/Makefile.include index 7537dabab7..bdb615db03 100644 --- a/boards/sensebox_samd21/Makefile.include +++ b/boards/sensebox_samd21/Makefile.include @@ -1,7 +1,3 @@ -# define the cpu used by SenseBox board -export CPU = samd21 -export CPU_MODEL = samd21g18a - PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) diff --git a/boards/slstk3401a/Makefile.dep b/boards/slstk3401a/Makefile.dep index 8e3b8130ec..e92caacf7f 100644 --- a/boards/slstk3401a/Makefile.dep +++ b/boards/slstk3401a/Makefile.dep @@ -5,5 +5,3 @@ endif # include board common dependencies include $(RIOTBOARD)/common/silabs/Makefile.dep - -include $(RIOTCPU)/efm32/Makefile.dep diff --git a/boards/slstk3401a/Makefile.features b/boards/slstk3401a/Makefile.features index 9266cb0b43..c062c756c9 100644 --- a/boards/slstk3401a/Makefile.features +++ b/boards/slstk3401a/Makefile.features @@ -1,3 +1,6 @@ +CPU = efm32 +CPU_MODEL = efm32pg1b200f256gm48 + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_gpio periph_gpio_irq @@ -9,5 +12,3 @@ FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart include $(RIOTBOARD)/common/silabs/Makefile.features - -include $(RIOTCPU)/efm32/Makefile.features diff --git a/boards/slstk3401a/Makefile.include b/boards/slstk3401a/Makefile.include index 0281335d25..260acdf982 100644 --- a/boards/slstk3401a/Makefile.include +++ b/boards/slstk3401a/Makefile.include @@ -1,7 +1,3 @@ -# define the cpu used by SLSTK3401A -export CPU = efm32 -export CPU_MODEL = efm32pg1b200f256gm48 - # set default port depending on operating system PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) diff --git a/boards/slstk3402a/Makefile.dep b/boards/slstk3402a/Makefile.dep index 8e3b8130ec..e92caacf7f 100644 --- a/boards/slstk3402a/Makefile.dep +++ b/boards/slstk3402a/Makefile.dep @@ -5,5 +5,3 @@ endif # include board common dependencies include $(RIOTBOARD)/common/silabs/Makefile.dep - -include $(RIOTCPU)/efm32/Makefile.dep diff --git a/boards/slstk3402a/Makefile.features b/boards/slstk3402a/Makefile.features index 9266cb0b43..39f5c017bc 100644 --- a/boards/slstk3402a/Makefile.features +++ b/boards/slstk3402a/Makefile.features @@ -1,3 +1,6 @@ +CPU = efm32 +CPU_MODEL = efm32pg12b500f1024gl125 + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_gpio periph_gpio_irq @@ -9,5 +12,3 @@ FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart include $(RIOTBOARD)/common/silabs/Makefile.features - -include $(RIOTCPU)/efm32/Makefile.features diff --git a/boards/slstk3402a/Makefile.include b/boards/slstk3402a/Makefile.include index 0667f8a449..260acdf982 100644 --- a/boards/slstk3402a/Makefile.include +++ b/boards/slstk3402a/Makefile.include @@ -1,7 +1,3 @@ -# define the cpu used by SLSTK3402A -export CPU = efm32 -export CPU_MODEL = efm32pg12b500f1024gl125 - # set default port depending on operating system PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) diff --git a/boards/sltb001a/Makefile.dep b/boards/sltb001a/Makefile.dep index 7eab2e2f7a..3df8520352 100644 --- a/boards/sltb001a/Makefile.dep +++ b/boards/sltb001a/Makefile.dep @@ -6,5 +6,3 @@ endif # include board common dependencies include $(RIOTBOARD)/common/silabs/Makefile.dep - -include $(RIOTCPU)/efm32/Makefile.dep diff --git a/boards/sltb001a/Makefile.features b/boards/sltb001a/Makefile.features index 9266cb0b43..63a8013ec9 100644 --- a/boards/sltb001a/Makefile.features +++ b/boards/sltb001a/Makefile.features @@ -1,3 +1,6 @@ +CPU = efm32 +CPU_MODEL = efr32mg1p132f256gm48 + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_gpio periph_gpio_irq @@ -9,5 +12,3 @@ FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart include $(RIOTBOARD)/common/silabs/Makefile.features - -include $(RIOTCPU)/efm32/Makefile.features diff --git a/boards/sltb001a/Makefile.include b/boards/sltb001a/Makefile.include index e7370b65a6..1e47fe61cb 100644 --- a/boards/sltb001a/Makefile.include +++ b/boards/sltb001a/Makefile.include @@ -1,7 +1,3 @@ -# define the cpu used by SLTB001A -export CPU = efm32 -export CPU_MODEL = efr32mg1p132f256gm48 - # set default port depending on operating system PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) diff --git a/boards/slwstk6220a/Makefile.features b/boards/slwstk6220a/Makefile.features index 144dcdcd75..a60bbbe7d7 100644 --- a/boards/slwstk6220a/Makefile.features +++ b/boards/slwstk6220a/Makefile.features @@ -1,6 +1,7 @@ +CPU = ezr32wg +CPU_MODEL = ezr32wg330f256r60 + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_gpio periph_gpio_irq FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart - -include $(RIOTCPU)/ezr32wg/Makefile.features diff --git a/boards/slwstk6220a/Makefile.include b/boards/slwstk6220a/Makefile.include index 1fb937e0d0..2b84830990 100644 --- a/boards/slwstk6220a/Makefile.include +++ b/boards/slwstk6220a/Makefile.include @@ -1,7 +1,3 @@ -# define the cpu used by WSTK6220 -export CPU = ezr32wg -export CPU_MODEL = ezr32wg330f256r60 - # set default port depending on operating system PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) diff --git a/boards/sodaq-autonomo/Makefile.features b/boards/sodaq-autonomo/Makefile.features index 8362267e52..fc009293f4 100644 --- a/boards/sodaq-autonomo/Makefile.features +++ b/boards/sodaq-autonomo/Makefile.features @@ -1,3 +1,6 @@ +CPU = samd21 +CPU_MODEL = samd21j18a + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_pwm @@ -7,5 +10,3 @@ FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += periph_usbdev - -include $(RIOTCPU)/samd21/Makefile.features diff --git a/boards/sodaq-autonomo/Makefile.include b/boards/sodaq-autonomo/Makefile.include index a29d9ee745..65f2e30d01 100644 --- a/boards/sodaq-autonomo/Makefile.include +++ b/boards/sodaq-autonomo/Makefile.include @@ -1,7 +1,3 @@ -# define the cpu used by SODAQ Autonomo board -export CPU = samd21 -export CPU_MODEL = samd21j18a - PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) diff --git a/boards/sodaq-explorer/Makefile.features b/boards/sodaq-explorer/Makefile.features index 7fc79e64bf..e078ee7758 100644 --- a/boards/sodaq-explorer/Makefile.features +++ b/boards/sodaq-explorer/Makefile.features @@ -1,3 +1,6 @@ +CPU = samd21 +CPU_MODEL = samd21j18a + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_i2c @@ -7,5 +10,3 @@ FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += periph_usbdev - -include $(RIOTCPU)/samd21/Makefile.features diff --git a/boards/sodaq-explorer/Makefile.include b/boards/sodaq-explorer/Makefile.include index db42ef2027..49f881d7e8 100644 --- a/boards/sodaq-explorer/Makefile.include +++ b/boards/sodaq-explorer/Makefile.include @@ -1,7 +1,3 @@ -# define the cpu used by the SODAQ ExpLoRer board -export CPU = samd21 -export CPU_MODEL = samd21j18a - PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) diff --git a/boards/sodaq-one/Makefile.features b/boards/sodaq-one/Makefile.features index 7fc79e64bf..e5b79684b9 100644 --- a/boards/sodaq-one/Makefile.features +++ b/boards/sodaq-one/Makefile.features @@ -1,3 +1,6 @@ +CPU = samd21 +CPU_MODEL = samd21g18a + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_i2c @@ -7,5 +10,3 @@ FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += periph_usbdev - -include $(RIOTCPU)/samd21/Makefile.features diff --git a/boards/sodaq-one/Makefile.include b/boards/sodaq-one/Makefile.include index 4b87c5c8cb..65f2e30d01 100644 --- a/boards/sodaq-one/Makefile.include +++ b/boards/sodaq-one/Makefile.include @@ -1,7 +1,3 @@ -# define the cpu used by the SODAQ ONE board -export CPU = samd21 -export CPU_MODEL = samd21g18a - PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) diff --git a/boards/sodaq-sara-aff/Makefile.features b/boards/sodaq-sara-aff/Makefile.features index 7fc79e64bf..e078ee7758 100644 --- a/boards/sodaq-sara-aff/Makefile.features +++ b/boards/sodaq-sara-aff/Makefile.features @@ -1,3 +1,6 @@ +CPU = samd21 +CPU_MODEL = samd21j18a + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_i2c @@ -7,5 +10,3 @@ FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += periph_usbdev - -include $(RIOTCPU)/samd21/Makefile.features diff --git a/boards/sodaq-sara-aff/Makefile.include b/boards/sodaq-sara-aff/Makefile.include index 70077c179a..65f2e30d01 100644 --- a/boards/sodaq-sara-aff/Makefile.include +++ b/boards/sodaq-sara-aff/Makefile.include @@ -1,7 +1,3 @@ -# define the cpu used by the SODAQ SARA AFF boards -export CPU = samd21 -export CPU_MODEL = samd21j18a - PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) diff --git a/boards/spark-core/Makefile.features b/boards/spark-core/Makefile.features index 948b54ca2a..0f9369ab26 100644 --- a/boards/spark-core/Makefile.features +++ b/boards/spark-core/Makefile.features @@ -1,6 +1,7 @@ +CPU = stm32f1 +CPU_MODEL = stm32f103cb + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_uart - -include $(RIOTCPU)/stm32f1/Makefile.features diff --git a/boards/spark-core/Makefile.include b/boards/spark-core/Makefile.include index 08e80c01a8..96d76b6b45 100644 --- a/boards/spark-core/Makefile.include +++ b/boards/spark-core/Makefile.include @@ -1,7 +1,3 @@ -## the cpu to build for -export CPU = stm32f1 -export CPU_MODEL = stm32f103cb - # configure the serial interface PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) diff --git a/boards/stk3600/Makefile.dep b/boards/stk3600/Makefile.dep index 6821288802..b271afb938 100644 --- a/boards/stk3600/Makefile.dep +++ b/boards/stk3600/Makefile.dep @@ -4,5 +4,3 @@ endif # include board common dependencies include $(RIOTBOARD)/common/silabs/Makefile.dep - -include $(RIOTCPU)/efm32/Makefile.dep diff --git a/boards/stk3600/Makefile.features b/boards/stk3600/Makefile.features index 678d81dede..02dd454c32 100644 --- a/boards/stk3600/Makefile.features +++ b/boards/stk3600/Makefile.features @@ -1,3 +1,6 @@ +CPU = efm32 +CPU_MODEL = efm32lg990f256 + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_dac @@ -11,5 +14,3 @@ FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart include $(RIOTBOARD)/common/silabs/Makefile.features - -include $(RIOTCPU)/efm32/Makefile.features diff --git a/boards/stk3600/Makefile.include b/boards/stk3600/Makefile.include index 957cc2c2d6..260acdf982 100644 --- a/boards/stk3600/Makefile.include +++ b/boards/stk3600/Makefile.include @@ -1,7 +1,3 @@ -# define the cpu used by STK3600 -export CPU = efm32 -export CPU_MODEL = efm32lg990f256 - # set default port depending on operating system PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) diff --git a/boards/stk3700/Makefile.dep b/boards/stk3700/Makefile.dep index 6821288802..b271afb938 100644 --- a/boards/stk3700/Makefile.dep +++ b/boards/stk3700/Makefile.dep @@ -4,5 +4,3 @@ endif # include board common dependencies include $(RIOTBOARD)/common/silabs/Makefile.dep - -include $(RIOTCPU)/efm32/Makefile.dep diff --git a/boards/stk3700/Makefile.features b/boards/stk3700/Makefile.features index 678d81dede..d6453d65ee 100644 --- a/boards/stk3700/Makefile.features +++ b/boards/stk3700/Makefile.features @@ -1,3 +1,6 @@ +CPU = efm32 +CPU_MODEL = efm32gg990f1024 + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_dac @@ -11,5 +14,3 @@ FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart include $(RIOTBOARD)/common/silabs/Makefile.features - -include $(RIOTCPU)/efm32/Makefile.features diff --git a/boards/stk3700/Makefile.include b/boards/stk3700/Makefile.include index 94deb04cc0..260acdf982 100644 --- a/boards/stk3700/Makefile.include +++ b/boards/stk3700/Makefile.include @@ -1,7 +1,3 @@ -# define the cpu used by STK3700 -export CPU = efm32 -export CPU_MODEL = efm32gg990f1024 - # set default port depending on operating system PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) diff --git a/boards/stm32f0discovery/Makefile.features b/boards/stm32f0discovery/Makefile.features index 9dc1c90807..4cdf696b3b 100644 --- a/boards/stm32f0discovery/Makefile.features +++ b/boards/stm32f0discovery/Makefile.features @@ -1,8 +1,9 @@ +CPU = stm32f0 +CPU_MODEL = stm32f051r8 + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_rtc FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart - -include $(RIOTCPU)/stm32f0/Makefile.features diff --git a/boards/stm32f0discovery/Makefile.include b/boards/stm32f0discovery/Makefile.include index d8b7fe9467..8458a10af3 100644 --- a/boards/stm32f0discovery/Makefile.include +++ b/boards/stm32f0discovery/Makefile.include @@ -1,7 +1,3 @@ -# define the cpu used by the stm32f0-discovery board -export CPU = stm32f0 -export CPU_MODEL = stm32f051r8 - # define the default port depending on the host OS PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) diff --git a/boards/stm32f3discovery/Makefile.features b/boards/stm32f3discovery/Makefile.features index 6e04ed2492..0c4c0ff4ea 100644 --- a/boards/stm32f3discovery/Makefile.features +++ b/boards/stm32f3discovery/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32f3 +CPU_MODEL = stm32f303vc + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_dac FEATURES_PROVIDED += periph_i2c @@ -6,5 +9,3 @@ FEATURES_PROVIDED += periph_rtc FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart - -include $(RIOTCPU)/stm32f3/Makefile.features diff --git a/boards/stm32f3discovery/Makefile.include b/boards/stm32f3discovery/Makefile.include index 36a73aa4f9..8458a10af3 100644 --- a/boards/stm32f3discovery/Makefile.include +++ b/boards/stm32f3discovery/Makefile.include @@ -1,7 +1,3 @@ -# define the cpu used by the stm32f3-discovery board -export CPU = stm32f3 -export CPU_MODEL = stm32f303vc - # define the default port depending on the host OS PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) diff --git a/boards/stm32f429i-disc1/Makefile.features b/boards/stm32f429i-disc1/Makefile.features index f0730e5454..082931f6f9 100644 --- a/boards/stm32f429i-disc1/Makefile.features +++ b/boards/stm32f429i-disc1/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32f4 +CPU_MODEL = stm32f429zi + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_spi @@ -6,5 +9,3 @@ FEATURES_PROVIDED += periph_uart # Put other features for this board (in alphabetical order) FEATURES_PROVIDED += riotboot - -include $(RIOTCPU)/stm32f4/Makefile.features diff --git a/boards/stm32f429i-disc1/Makefile.include b/boards/stm32f429i-disc1/Makefile.include index 8fdb8b1b32..1c1c84ed83 100644 --- a/boards/stm32f429i-disc1/Makefile.include +++ b/boards/stm32f429i-disc1/Makefile.include @@ -1,7 +1,3 @@ -# define the cpu used by the stm32f4-discovery board -export CPU = stm32f4 -export CPU_MODEL = stm32f429zi - # we use shared STM32 configuration snippets INCLUDES += -I$(RIOTBOARD)/common/stm32/include diff --git a/boards/stm32f4discovery/Makefile.features b/boards/stm32f4discovery/Makefile.features index fcdb129869..b2d4746186 100644 --- a/boards/stm32f4discovery/Makefile.features +++ b/boards/stm32f4discovery/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32f4 +CPU_MODEL = stm32f407vg + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_dac @@ -14,5 +17,3 @@ FEATURES_PROVIDED += arduino # TODO: re-think concept for conflicts based on actual used peripherals... FEATURES_CONFLICT += periph_spi:periph_dac FEATURES_CONFLICT_MSG += "On stm32f4discovery boards there are the same pins for the DAC and/or SPI_0." - -include $(RIOTCPU)/stm32f4/Makefile.features diff --git a/boards/stm32f4discovery/Makefile.include b/boards/stm32f4discovery/Makefile.include index cafdf1d55f..00abe5fd98 100644 --- a/boards/stm32f4discovery/Makefile.include +++ b/boards/stm32f4discovery/Makefile.include @@ -1,7 +1,3 @@ -# define the cpu used by the stm32f4-discovery board -export CPU = stm32f4 -export CPU_MODEL = stm32f407vg - # we use shared STM32 configuration snippets INCLUDES += -I$(RIOTBOARD)/common/stm32/include diff --git a/boards/stm32f769i-disco/Makefile.features b/boards/stm32f769i-disco/Makefile.features index 9d2a7e1e25..ed0d7b23cb 100644 --- a/boards/stm32f769i-disco/Makefile.features +++ b/boards/stm32f769i-disco/Makefile.features @@ -1,7 +1,8 @@ +CPU = stm32f7 +CPU_MODEL = stm32f769ni + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_rtc FEATURES_PROVIDED += periph_rtt FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart - -include $(RIOTCPU)/stm32f7/Makefile.features diff --git a/boards/stm32f769i-disco/Makefile.include b/boards/stm32f769i-disco/Makefile.include index 174a171eff..1c1c84ed83 100644 --- a/boards/stm32f769i-disco/Makefile.include +++ b/boards/stm32f769i-disco/Makefile.include @@ -1,7 +1,3 @@ -# define the cpu used by the stm32f769-discovery board -export CPU = stm32f7 -export CPU_MODEL = stm32f769ni - # we use shared STM32 configuration snippets INCLUDES += -I$(RIOTBOARD)/common/stm32/include diff --git a/boards/stm32l0538-disco/Makefile.features b/boards/stm32l0538-disco/Makefile.features index 58bcf08ecb..e44a4a7322 100644 --- a/boards/stm32l0538-disco/Makefile.features +++ b/boards/stm32l0538-disco/Makefile.features @@ -1,7 +1,8 @@ +CPU = stm32l0 +CPU_MODEL = stm32l053c8 + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_rtc FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart - -include $(RIOTCPU)/stm32l0/Makefile.features diff --git a/boards/stm32l0538-disco/Makefile.include b/boards/stm32l0538-disco/Makefile.include index 79ceaa657a..b02b2e36c3 100644 --- a/boards/stm32l0538-disco/Makefile.include +++ b/boards/stm32l0538-disco/Makefile.include @@ -1,7 +1,3 @@ -# define the cpu used by the stm32l0538-disco board -export CPU = stm32l0 -export CPU_MODEL = stm32l053c8 - # we use shared STM32 configuration snippets INCLUDES += -I$(RIOTBOARD)/common/stm32/include diff --git a/boards/stm32l476g-disco/Makefile.features b/boards/stm32l476g-disco/Makefile.features index 1ce0d21a31..160ee64f7e 100644 --- a/boards/stm32l476g-disco/Makefile.features +++ b/boards/stm32l476g-disco/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32l4 +CPU_MODEL = stm32l476vg + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_rtc FEATURES_PROVIDED += periph_rtt @@ -6,5 +9,3 @@ FEATURES_PROVIDED += periph_uart # Put other features for this board (in alphabetical order) FEATURES_PROVIDED += riotboot - -include $(RIOTCPU)/stm32l4/Makefile.features diff --git a/boards/stm32l476g-disco/Makefile.include b/boards/stm32l476g-disco/Makefile.include index 773cbd8d08..12830047ed 100644 --- a/boards/stm32l476g-disco/Makefile.include +++ b/boards/stm32l476g-disco/Makefile.include @@ -1,7 +1,3 @@ -# the cpu to build for -export CPU = stm32l4 -export CPU_MODEL = stm32l476vg - # we use shared STM32 configuration snippets INCLUDES += -I$(RIOTBOARD)/common/stm32/include diff --git a/boards/teensy31/Makefile.dep b/boards/teensy31/Makefile.dep index 98782c48fb..e69de29bb2 100644 --- a/boards/teensy31/Makefile.dep +++ b/boards/teensy31/Makefile.dep @@ -1 +0,0 @@ -include $(RIOTCPU)/kinetis/Makefile.dep diff --git a/boards/teensy31/Makefile.features b/boards/teensy31/Makefile.features index b64eb91051..417d1c9f31 100644 --- a/boards/teensy31/Makefile.features +++ b/boards/teensy31/Makefile.features @@ -1,8 +1,9 @@ +CPU = kinetis +CPU_MODEL = mk20dx256vlh7 + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_pwm FEATURES_PROVIDED += periph_rtc FEATURES_PROVIDED += periph_rtt FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart - -include $(RIOTCPU)/kinetis/Makefile.features diff --git a/boards/teensy31/Makefile.include b/boards/teensy31/Makefile.include index 5be3135c51..67fd7a7103 100644 --- a/boards/teensy31/Makefile.include +++ b/boards/teensy31/Makefile.include @@ -1,7 +1,3 @@ -# define the cpu used by the Teensy3.1 & 3.2 board -CPU = kinetis -CPU_MODEL = mk20dx256vlh7 - # custom flasher to use with the bootloader TEENSY_LOADER = $(RIOTTOOLS)/teensy-loader-cli/teensy_loader FLASHER = $(TEENSY_LOADER) diff --git a/boards/telosb/Makefile.features b/boards/telosb/Makefile.features index 98d6e62aa1..8178449bce 100644 --- a/boards/telosb/Makefile.features +++ b/boards/telosb/Makefile.features @@ -1,3 +1,6 @@ +CPU = msp430fxyz +CPU_MODEL = msp430f1611 + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_gpio periph_gpio_irq FEATURES_PROVIDED += periph_spi @@ -5,5 +8,3 @@ FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart # Various other features (if any) - -include $(RIOTCPU)/msp430fxyz/Makefile.features diff --git a/boards/telosb/Makefile.include b/boards/telosb/Makefile.include index 9e69e1cad4..f0ae27c240 100644 --- a/boards/telosb/Makefile.include +++ b/boards/telosb/Makefile.include @@ -1,7 +1,3 @@ -## the cpu to build for -export CPU = msp430fxyz -export CPU_MODEL = msp430f1611 - # set default port depending on operating system PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbserial-MXV*))) diff --git a/boards/thingy52/Makefile.features b/boards/thingy52/Makefile.features index ebfd151268..ebbf16569c 100644 --- a/boards/thingy52/Makefile.features +++ b/boards/thingy52/Makefile.features @@ -1,3 +1,5 @@ +CPU_MODEL = nrf52832xxaa + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_uart diff --git a/boards/thingy52/Makefile.include b/boards/thingy52/Makefile.include index bf6e40dba2..61e16f2acc 100644 --- a/boards/thingy52/Makefile.include +++ b/boards/thingy52/Makefile.include @@ -1,6 +1,3 @@ -# CPU configuration for the Thingy:52 -CPU_MODEL = nrf52832xxaa - # for this board, we are using Segger's RTT as default terminal interface USEMODULE += stdio_rtt TERMPROG = $(RIOTTOOLS)/jlink/jlink.sh diff --git a/boards/ublox-c030-u201/Makefile.features b/boards/ublox-c030-u201/Makefile.features index 3a89cab3dd..ef62dcde7b 100644 --- a/boards/ublox-c030-u201/Makefile.features +++ b/boards/ublox-c030-u201/Makefile.features @@ -1,3 +1,6 @@ +CPU = stm32f4 +CPU_MODEL = stm32f437vg + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_i2c @@ -5,5 +8,3 @@ FEATURES_PROVIDED += periph_rtc FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart - -include $(RIOTCPU)/stm32f4/Makefile.features diff --git a/boards/ublox-c030-u201/Makefile.include b/boards/ublox-c030-u201/Makefile.include index 5d9010842b..1f308959a0 100644 --- a/boards/ublox-c030-u201/Makefile.include +++ b/boards/ublox-c030-u201/Makefile.include @@ -1,7 +1,3 @@ -## the cpu to build for -export CPU = stm32f4 -export CPU_MODEL = stm32f437vg - # we use shared STM32 configuration snippets INCLUDES += -I$(RIOTBOARD)/common/stm32/include diff --git a/boards/waspmote-pro/Makefile.features b/boards/waspmote-pro/Makefile.features index 86895b34bb..e62d30519b 100644 --- a/boards/waspmote-pro/Makefile.features +++ b/boards/waspmote-pro/Makefile.features @@ -1,3 +1,5 @@ +CPU = atmega1281 + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_gpio periph_gpio_irq @@ -7,5 +9,3 @@ FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart # Various other features (if any) - --include $(RIOTCPU)/atmega1281/Makefile.features diff --git a/boards/waspmote-pro/Makefile.include b/boards/waspmote-pro/Makefile.include index 9bd9d495a4..b8feeac07f 100644 --- a/boards/waspmote-pro/Makefile.include +++ b/boards/waspmote-pro/Makefile.include @@ -1,6 +1,3 @@ -# define the cpu used by the waspmote pro board -export CPU = atmega1281 - # Bootloader uses stk500v1 protocol, which usually is implemented in # bootloaders of 2K size. # http://www.libelium.com/products/waspmote/hardware/ diff --git a/boards/yunjia-nrf51822/Makefile.features b/boards/yunjia-nrf51822/Makefile.features index e5a4957546..baee32552f 100644 --- a/boards/yunjia-nrf51822/Makefile.features +++ b/boards/yunjia-nrf51822/Makefile.features @@ -1,3 +1,5 @@ +CPU_MODEL = nrf51x22xxaa + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_i2c diff --git a/boards/yunjia-nrf51822/Makefile.include b/boards/yunjia-nrf51822/Makefile.include index 591fe6bf57..4bed65978e 100644 --- a/boards/yunjia-nrf51822/Makefile.include +++ b/boards/yunjia-nrf51822/Makefile.include @@ -1,6 +1,3 @@ -# define the used CPU model -export CPU_MODEL = nrf51x22xxaa - # include common nrf51 boards module into the build USEMODULE += boards_common_nrf51 diff --git a/boards/z1/Makefile.features b/boards/z1/Makefile.features index 98d6e62aa1..7a13d1dceb 100644 --- a/boards/z1/Makefile.features +++ b/boards/z1/Makefile.features @@ -1,3 +1,6 @@ +CPU = msp430fxyz +CPU_MODEL = msp430f2617 + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_gpio periph_gpio_irq FEATURES_PROVIDED += periph_spi @@ -5,5 +8,3 @@ FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart # Various other features (if any) - -include $(RIOTCPU)/msp430fxyz/Makefile.features diff --git a/boards/z1/Makefile.include b/boards/z1/Makefile.include index fee293002e..59f64ef416 100644 --- a/boards/z1/Makefile.include +++ b/boards/z1/Makefile.include @@ -1,7 +1,3 @@ -# CPU used by this board -export CPU = msp430fxyz -export CPU_MODEL = msp430f2617 - # set default port depending on operating system PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))