Merge pull request #12014 from cladmi/pr/cpu_cpu_model/migration/stra…

…ightforward_ones

 boards: move CPU/CPU_MODEL definition to Makefile.features

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

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
 

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

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
 

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

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*)))

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

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*)))

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

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

boards/arduino-mkr1000/Makefile.features

@@ -1,3 +1 @@
 include $(RIOTBOARD)/common/arduino-mkr/Makefile.features
-
-include $(RIOTCPU)/samd21/Makefile.features

boards/arduino-mkrfox1200/Makefile.features

@@ -1,3 +1 @@
 include $(RIOTBOARD)/common/arduino-mkr/Makefile.features
-
-include $(RIOTCPU)/samd21/Makefile.features

boards/arduino-mkrzero/Makefile.features

@@ -1,3 +1 @@
 include $(RIOTBOARD)/common/arduino-mkr/Makefile.features
-
-include $(RIOTCPU)/samd21/Makefile.features

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

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*)))

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

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*)))

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

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
 

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

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
 

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

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
 

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

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*)))

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

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

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

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

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

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

boards/common/arduino-due/Makefile.features

@@ -1,3 +1,6 @@
+CPU = sam3
+CPU_MODEL = sam3x8e
+
 # Put defined MCU peripherals here (in alphabetical order)
 FEATURES_PROVIDED += periph_adc
 FEATURES_PROVIDED += periph_dac
@@ -9,5 +12,3 @@ FEATURES_PROVIDED += periph_uart
 
 # Various other features (if any)
 FEATURES_PROVIDED += arduino
-
-include $(RIOTCPU)/sam3/Makefile.features

boards/common/arduino-due/Makefile.include

@@ -1,7 +1,3 @@
-# define the cpu used by the arduino due based boards
-export CPU = sam3
-export CPU_MODEL = sam3x8e
-
 # export this module and its includes
 USEMODULE += boards_common_arduino_due
 INCLUDES  += -I$(RIOTBOARD)/common/arduino-due/include

boards/common/arduino-mkr/Makefile.features

@@ -1,3 +1,7 @@
+CPU = samd21
+CPU_MODEL = samd21g18a
+
+
 # Put defined MCU peripherals here (in alphabetical order)
 FEATURES_PROVIDED += periph_adc
 FEATURES_PROVIDED += periph_i2c

boards/common/arduino-mkr/Makefile.include

@@ -1,7 +1,3 @@
-# define the cpu used by Arduino/Genuino MKR1000 board
-export CPU = samd21
-export CPU_MODEL = samd21g18a
-
 PORT_LINUX ?= /dev/ttyACM0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
 

boards/common/iotlab/Makefile.features

@@ -1,3 +1,6 @@
+CPU = stm32f1
+CPU_MODEL = stm32f103re
+
 # Put defined MCU peripherals here (in alphabetical order)
 FEATURES_PROVIDED += periph_i2c
 FEATURES_PROVIDED += periph_rtt

boards/common/iotlab/Makefile.include

@@ -1,7 +1,3 @@
-# the cpu to build for
-export CPU = stm32f1
-export CPU_MODEL = stm32f103re
-
 # define the default port depending on the host OS
 PORT_LINUX ?= /dev/ttyUSB1
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbserial*B)))

boards/common/kw41z/Makefile.dep

@@ -2,5 +2,3 @@ ifneq (,$(filter saul_default,$(USEMODULE)))
   USEMODULE += saul_adc
   USEMODULE += saul_gpio
 endif
-
-include $(RIOTCPU)/kinetis/Makefile.dep

boards/common/kw41z/Makefile.features

@@ -1,3 +1,6 @@
+CPU = kinetis
+CPU_MODEL = mkw41z512vht4
+
 # Put defined MCU peripherals here (in alphabetical order)
 FEATURES_PROVIDED += periph_adc
 FEATURES_PROVIDED += periph_rtc
@@ -7,5 +10,3 @@ FEATURES_PROVIDED += periph_uart
 
 # Put other features for this board (in alphabetical order)
 FEATURES_PROVIDED += riotboot
-
-include $(RIOTCPU)/kinetis/Makefile.features

boards/common/kw41z/Makefile.include

@@ -1,7 +1,3 @@
-# define the cpu used by the board
-export CPU = kinetis
-export CPU_MODEL = mkw41z512vht4
-
 # include this module into the build
 INCLUDES += -I$(RIOTBOARD)/common/kw41z/include
 

boards/common/msb-430/Makefile.features

@@ -1 +1,2 @@
-include $(RIOTCPU)/msp430fxyz/Makefile.features
+CPU = msp430fxyz
+CPU_MODEL = msp430f1612

boards/common/msb-430/Makefile.include

@@ -1,7 +1,3 @@
-## the cpu to build for
-export CPU = msp430fxyz
-export CPU_MODEL = msp430f1612
-
 # set default port depending on operating system
 PORT_LINUX ?= /dev/ttyUSB0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))

boards/common/msba2/Makefile.features

@@ -1 +1 @@
-include $(RIOTCPU)/lpc2387/Makefile.features
+CPU = lpc2387

boards/common/msba2/Makefile.include

@@ -1,8 +1,5 @@
 BOARDS_COMMON_MSBA2_DIR := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST))))
 
-## the cpu to build for
-export CPU = lpc2387
-
 # Compile `lpc2k_pgm` when required
 # It is still compiling in `boards` as it was the case before introducing the
 # rule to autobuild

boards/common/nrf51/Makefile.features

@@ -1,8 +1,8 @@
+CPU = nrf51
+
 # Put defined MCU peripherals here (in alphabetical order)
 FEATURES_PROVIDED += periph_rtt
 FEATURES_PROVIDED += periph_timer
 
 # Various other features (if any)
 FEATURES_PROVIDED += ble_nimble
-
--include $(RIOTCPU)/nrf51/Makefile.features

boards/common/nrf51/Makefile.include

@@ -1,6 +1,3 @@
-# define the used CPU
-export CPU = nrf51
-
 # setup serial terminal
 include $(RIOTMAKE)/tools/serial.inc.mk
 

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

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*)))

boards/common/remote/Makefile.features

@@ -1 +1,2 @@
-include $(RIOTCPU)/cc2538/Makefile.features
+CPU = cc2538
+CPU_MODEL = cc2538sf53

boards/common/remote/Makefile.include

@@ -1,7 +1,3 @@
-# define the cpu used by the RE-mote board
-export CPU       =  cc2538
-export CPU_MODEL =  cc2538sf53
-
 # define the default flash-tool
 export PROGRAMMER ?= cc2538-bsl
 

boards/common/saml1x/Makefile.features

@@ -1,3 +1,5 @@
+CPU = saml1x
+
 # Put defined MCU peripherals here (in alphabetical order)
 FEATURES_PROVIDED += periph_adc
 FEATURES_PROVIDED += periph_i2c
@@ -9,5 +11,3 @@ FEATURES_PROVIDED += periph_uart
 
 # Put other features on these boards (in alphabetical order)
 FEATURES_PROVIDED += riotboot
-
-include $(RIOTCPU)/saml1x/Makefile.features

boards/common/saml1x/Makefile.include

@@ -1,6 +1,3 @@
-# define the cpu used by the saml11 board
-export CPU = saml1x
-
 # set edbg device type
 EDBG_DEVICE_TYPE = mchp_cm23