From 7139393394985177af1f3022ba8ae9b47c2a5d4d Mon Sep 17 00:00:00 2001 From: Francisco Acosta <fco.ja.ac@gmail.com> Date: Mon, 5 Nov 2018 18:04:43 +0100 Subject: [PATCH] boards: include potential features from CPU for atmega boards Features must be provided by the board if they're actually available on board. Other features might be provided by the CPU. Some grouping is also removed as it is not necessary. --- boards/common/arduino-atmega/Makefile.features | 3 --- boards/jiminy-mega256rfr2/Makefile.features | 6 ++---- boards/mega-xplained/Makefile.features | 5 +---- boards/waspmote-pro/Makefile.features | 5 +---- 4 files changed, 4 insertions(+), 15 deletions(-) diff --git a/boards/common/arduino-atmega/Makefile.features b/boards/common/arduino-atmega/Makefile.features index ec1f08f176..d47ec4565f 100644 --- a/boards/common/arduino-atmega/Makefile.features +++ b/boards/common/arduino-atmega/Makefile.features @@ -11,6 +11,3 @@ ifeq (,$(filter jiminy-mega256rfr2,$(BOARD))) FEATURES_PROVIDED += arduino FEATURES_PROVIDED += periph_pwm endif - -# The board MPU family (used for grouping by the CI system) -FEATURES_MCU_GROUP = avr8 diff --git a/boards/jiminy-mega256rfr2/Makefile.features b/boards/jiminy-mega256rfr2/Makefile.features index 358ba448f5..5ad360ac35 100644 --- a/boards/jiminy-mega256rfr2/Makefile.features +++ b/boards/jiminy-mega256rfr2/Makefile.features @@ -1,10 +1,8 @@ +# 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 -# The board MPU family (used for grouping by the CI system) -FEATURES_MCU_GROUP = avr6 - -include $(RIOTCPU)/atmega256rfr2/Makefile.features +-include $(RIOTCPU)/atmega256rfr2/Makefile.features diff --git a/boards/mega-xplained/Makefile.features b/boards/mega-xplained/Makefile.features index 7a8d6d41bf..56b3086778 100644 --- a/boards/mega-xplained/Makefile.features +++ b/boards/mega-xplained/Makefile.features @@ -8,7 +8,4 @@ FEATURES_PROVIDED += periph_uart # Various other features (if any) -# The board MPU family (used for grouping by the CI system) -FEATURES_MCU_GROUP = avr8 - -include $(RIOTCPU)/atmega1284p/Makefile.features +-include $(RIOTCPU)/atmega1284p/Makefile.features diff --git a/boards/waspmote-pro/Makefile.features b/boards/waspmote-pro/Makefile.features index c4cd23b264..86895b34bb 100644 --- a/boards/waspmote-pro/Makefile.features +++ b/boards/waspmote-pro/Makefile.features @@ -8,7 +8,4 @@ FEATURES_PROVIDED += periph_uart # Various other features (if any) -# The board MPU family (used for grouping by the CI system) -FEATURES_MCU_GROUP = avr8 - -include $(RIOTCPU)/atmega1281/Makefile.features +-include $(RIOTCPU)/atmega1281/Makefile.features -- GitLab