fixup! boards: move CPU/CPU_MODEL definition to Makefile.features

RIOT-OS · Jul 1, 2019 · 2bd0746 · 2bd0746
1 parent d2484b9
commit 2bd0746
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 18 deletions.
diff --git 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
 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
@@ -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/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
@@ -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/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
@@ -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