From 59b3e0ceddc2d25c56bab664d959fd10a3a5e66e Mon Sep 17 00:00:00 2001
From: Hauke Petersen <hauke.petersen@fu-berlin.de>
Date: Thu, 16 Nov 2017 12:30:16 +0100
Subject: [PATCH] boards/nucleo: move shared code to common/nucleo

---
 .../{nucleo-common => common/nucleo}/Makefile  |  0
 .../nucleo}/Makefile.dep                       |  0
 .../nucleo}/Makefile.features                  |  0
 boards/common/nucleo/Makefile.include          |  5 +++++
 .../nucleo}/Makefile.include.serial            | 18 +++++++++---------
 .../nucleo}/dist/openocd-f0.cfg                |  0
 .../nucleo}/dist/openocd-f1.cfg                |  0
 .../nucleo}/dist/openocd-f2.cfg                |  0
 .../nucleo}/dist/openocd-f3.cfg                |  0
 .../nucleo}/dist/openocd-f4.cfg                |  0
 .../nucleo}/dist/openocd-f7.cfg                |  0
 .../nucleo}/dist/openocd-l0.cfg                |  0
 .../nucleo}/dist/openocd-l1.cfg                |  0
 .../nucleo}/dist/openocd-l4.cfg                |  0
 .../nucleo}/include/arduino_board.h            |  0
 .../nucleo}/include/arduino_pinmap.h           |  0
 .../nucleo}/include/board_common.h             |  0
 .../nucleo}/include/gpio_params.h              |  0
 boards/nucleo-common/Makefile.include          |  5 -----
 boards/nucleo-f030/Makefile.dep                |  2 +-
 boards/nucleo-f030/Makefile.features           |  2 +-
 boards/nucleo-f030/Makefile.include            |  2 +-
 boards/nucleo-f070/Makefile.dep                |  2 +-
 boards/nucleo-f070/Makefile.features           |  2 +-
 boards/nucleo-f070/Makefile.include            |  2 +-
 boards/nucleo-f072/Makefile.dep                |  2 +-
 boards/nucleo-f072/Makefile.features           |  2 +-
 boards/nucleo-f072/Makefile.include            |  2 +-
 boards/nucleo-f091/Makefile.dep                |  2 +-
 boards/nucleo-f091/Makefile.features           |  2 +-
 boards/nucleo-f091/Makefile.include            |  2 +-
 boards/nucleo-f103/Makefile.dep                |  2 +-
 boards/nucleo-f103/Makefile.features           |  2 +-
 boards/nucleo-f103/Makefile.include            |  2 +-
 boards/nucleo-f302/Makefile.dep                |  2 +-
 boards/nucleo-f302/Makefile.features           |  2 +-
 boards/nucleo-f302/Makefile.include            |  2 +-
 boards/nucleo-f303/Makefile.dep                |  2 +-
 boards/nucleo-f303/Makefile.features           |  2 +-
 boards/nucleo-f303/Makefile.include            |  2 +-
 boards/nucleo-f334/Makefile.dep                |  2 +-
 boards/nucleo-f334/Makefile.features           |  2 +-
 boards/nucleo-f334/Makefile.include            |  2 +-
 boards/nucleo-f401/Makefile.dep                |  2 +-
 boards/nucleo-f401/Makefile.features           |  2 +-
 boards/nucleo-f401/Makefile.include            |  2 +-
 boards/nucleo-f410/Makefile.dep                |  2 +-
 boards/nucleo-f410/Makefile.include            |  2 +-
 boards/nucleo-f411/Makefile.dep                |  2 +-
 boards/nucleo-f411/Makefile.include            |  2 +-
 boards/nucleo-f446/Makefile.dep                |  2 +-
 boards/nucleo-f446/Makefile.features           |  2 +-
 boards/nucleo-f446/Makefile.include            |  2 +-
 boards/nucleo-l053/Makefile.dep                |  2 +-
 boards/nucleo-l053/Makefile.features           |  2 +-
 boards/nucleo-l053/Makefile.include            |  2 +-
 boards/nucleo-l073/Makefile.dep                |  2 +-
 boards/nucleo-l073/Makefile.features           |  2 +-
 boards/nucleo-l073/Makefile.include            |  2 +-
 boards/nucleo-l152/Makefile.dep                |  2 +-
 boards/nucleo-l152/Makefile.features           |  2 +-
 boards/nucleo-l152/Makefile.include            |  2 +-
 boards/nucleo-l476/Makefile.dep                |  2 +-
 boards/nucleo-l476/Makefile.features           |  2 +-
 boards/nucleo-l476/Makefile.include            |  2 +-
 65 files changed, 60 insertions(+), 60 deletions(-)
 rename boards/{nucleo-common => common/nucleo}/Makefile (100%)
 rename boards/{nucleo-common => common/nucleo}/Makefile.dep (100%)
 rename boards/{nucleo-common => common/nucleo}/Makefile.features (100%)
 create mode 100644 boards/common/nucleo/Makefile.include
 rename boards/{nucleo-common => common/nucleo}/Makefile.include.serial (59%)
 rename boards/{nucleo-common => common/nucleo}/dist/openocd-f0.cfg (100%)
 rename boards/{nucleo-common => common/nucleo}/dist/openocd-f1.cfg (100%)
 rename boards/{nucleo-common => common/nucleo}/dist/openocd-f2.cfg (100%)
 rename boards/{nucleo-common => common/nucleo}/dist/openocd-f3.cfg (100%)
 rename boards/{nucleo-common => common/nucleo}/dist/openocd-f4.cfg (100%)
 rename boards/{nucleo-common => common/nucleo}/dist/openocd-f7.cfg (100%)
 rename boards/{nucleo-common => common/nucleo}/dist/openocd-l0.cfg (100%)
 rename boards/{nucleo-common => common/nucleo}/dist/openocd-l1.cfg (100%)
 rename boards/{nucleo-common => common/nucleo}/dist/openocd-l4.cfg (100%)
 rename boards/{nucleo-common => common/nucleo}/include/arduino_board.h (100%)
 rename boards/{nucleo-common => common/nucleo}/include/arduino_pinmap.h (100%)
 rename boards/{nucleo-common => common/nucleo}/include/board_common.h (100%)
 rename boards/{nucleo-common => common/nucleo}/include/gpio_params.h (100%)
 delete mode 100644 boards/nucleo-common/Makefile.include

diff --git a/boards/nucleo-common/Makefile b/boards/common/nucleo/Makefile
similarity index 100%
rename from boards/nucleo-common/Makefile
rename to boards/common/nucleo/Makefile
diff --git a/boards/nucleo-common/Makefile.dep b/boards/common/nucleo/Makefile.dep
similarity index 100%
rename from boards/nucleo-common/Makefile.dep
rename to boards/common/nucleo/Makefile.dep
diff --git a/boards/nucleo-common/Makefile.features b/boards/common/nucleo/Makefile.features
similarity index 100%
rename from boards/nucleo-common/Makefile.features
rename to boards/common/nucleo/Makefile.features
diff --git a/boards/common/nucleo/Makefile.include b/boards/common/nucleo/Makefile.include
new file mode 100644
index 0000000000..21b714a355
--- /dev/null
+++ b/boards/common/nucleo/Makefile.include
@@ -0,0 +1,5 @@
+# include nucleo common serial configuration
+include $(RIOTBOARD)/common/nucleo/Makefile.include.serial
+
+# add the common header files to the include path
+INCLUDES += -I$(RIOTBOARD)/common/nucleo/include
diff --git a/boards/nucleo-common/Makefile.include.serial b/boards/common/nucleo/Makefile.include.serial
similarity index 59%
rename from boards/nucleo-common/Makefile.include.serial
rename to boards/common/nucleo/Makefile.include.serial
index 20bc2220d4..a5e9afab2c 100644
--- a/boards/nucleo-common/Makefile.include.serial
+++ b/boards/common/nucleo/Makefile.include.serial
@@ -12,23 +12,23 @@ export STLINK_VERSION ?= 2-1
 # Choose OpenOCD board configuration depending on CPU type
 ifeq (,$(OPENOCD_CONFIG))
   ifeq ($(CPU),stm32f0)
-    export OPENOCD_CONFIG := $(RIOTBOARD)/nucleo-common/dist/openocd-f0.cfg
+    export OPENOCD_CONFIG := $(RIOTBOARD)/common/nucleo/dist/openocd-f0.cfg
   else ifeq ($(CPU),stm32f1)
-    export OPENOCD_CONFIG := $(RIOTBOARD)/nucleo-common/dist/openocd-f1.cfg
+    export OPENOCD_CONFIG := $(RIOTBOARD)/common/nucleo/dist/openocd-f1.cfg
   else ifeq ($(CPU),stm32f2)
-    export OPENOCD_CONFIG := $(RIOTBOARD)/nucleo-common/dist/openocd-f2.cfg
+    export OPENOCD_CONFIG := $(RIOTBOARD)/common/nucleo/dist/openocd-f2.cfg
   else ifeq ($(CPU),stm32f3)
-    export OPENOCD_CONFIG := $(RIOTBOARD)/nucleo-common/dist/openocd-f3.cfg
+    export OPENOCD_CONFIG := $(RIOTBOARD)/common/nucleo/dist/openocd-f3.cfg
   else ifeq ($(CPU),stm32f4)
-    export OPENOCD_CONFIG := $(RIOTBOARD)/nucleo-common/dist/openocd-f4.cfg
+    export OPENOCD_CONFIG := $(RIOTBOARD)/common/nucleo/dist/openocd-f4.cfg
   else ifeq ($(CPU),stm32f7)
-    export OPENOCD_CONFIG := $(RIOTBOARD)/nucleo-common/dist/openocd-f7.cfg
+    export OPENOCD_CONFIG := $(RIOTBOARD)/common/nucleo/dist/openocd-f7.cfg
   else ifeq ($(CPU),stm32l0)
-    export OPENOCD_CONFIG := $(RIOTBOARD)/nucleo-common/dist/openocd-l0.cfg
+    export OPENOCD_CONFIG := $(RIOTBOARD)/common/nucleo/dist/openocd-l0.cfg
   else ifeq ($(CPU),stm32l1)
-    export OPENOCD_CONFIG := $(RIOTBOARD)/nucleo-common/dist/openocd-l1.cfg
+    export OPENOCD_CONFIG := $(RIOTBOARD)/common/nucleo/dist/openocd-l1.cfg
   else ifeq ($(CPU),stm32l4)
-    export OPENOCD_CONFIG := $(RIOTBOARD)/nucleo-common/dist/openocd-l4.cfg
+    export OPENOCD_CONFIG := $(RIOTBOARD)/common/nucleo/dist/openocd-l4.cfg
   endif
 endif
 
diff --git a/boards/nucleo-common/dist/openocd-f0.cfg b/boards/common/nucleo/dist/openocd-f0.cfg
similarity index 100%
rename from boards/nucleo-common/dist/openocd-f0.cfg
rename to boards/common/nucleo/dist/openocd-f0.cfg
diff --git a/boards/nucleo-common/dist/openocd-f1.cfg b/boards/common/nucleo/dist/openocd-f1.cfg
similarity index 100%
rename from boards/nucleo-common/dist/openocd-f1.cfg
rename to boards/common/nucleo/dist/openocd-f1.cfg
diff --git a/boards/nucleo-common/dist/openocd-f2.cfg b/boards/common/nucleo/dist/openocd-f2.cfg
similarity index 100%
rename from boards/nucleo-common/dist/openocd-f2.cfg
rename to boards/common/nucleo/dist/openocd-f2.cfg
diff --git a/boards/nucleo-common/dist/openocd-f3.cfg b/boards/common/nucleo/dist/openocd-f3.cfg
similarity index 100%
rename from boards/nucleo-common/dist/openocd-f3.cfg
rename to boards/common/nucleo/dist/openocd-f3.cfg
diff --git a/boards/nucleo-common/dist/openocd-f4.cfg b/boards/common/nucleo/dist/openocd-f4.cfg
similarity index 100%
rename from boards/nucleo-common/dist/openocd-f4.cfg
rename to boards/common/nucleo/dist/openocd-f4.cfg
diff --git a/boards/nucleo-common/dist/openocd-f7.cfg b/boards/common/nucleo/dist/openocd-f7.cfg
similarity index 100%
rename from boards/nucleo-common/dist/openocd-f7.cfg
rename to boards/common/nucleo/dist/openocd-f7.cfg
diff --git a/boards/nucleo-common/dist/openocd-l0.cfg b/boards/common/nucleo/dist/openocd-l0.cfg
similarity index 100%
rename from boards/nucleo-common/dist/openocd-l0.cfg
rename to boards/common/nucleo/dist/openocd-l0.cfg
diff --git a/boards/nucleo-common/dist/openocd-l1.cfg b/boards/common/nucleo/dist/openocd-l1.cfg
similarity index 100%
rename from boards/nucleo-common/dist/openocd-l1.cfg
rename to boards/common/nucleo/dist/openocd-l1.cfg
diff --git a/boards/nucleo-common/dist/openocd-l4.cfg b/boards/common/nucleo/dist/openocd-l4.cfg
similarity index 100%
rename from boards/nucleo-common/dist/openocd-l4.cfg
rename to boards/common/nucleo/dist/openocd-l4.cfg
diff --git a/boards/nucleo-common/include/arduino_board.h b/boards/common/nucleo/include/arduino_board.h
similarity index 100%
rename from boards/nucleo-common/include/arduino_board.h
rename to boards/common/nucleo/include/arduino_board.h
diff --git a/boards/nucleo-common/include/arduino_pinmap.h b/boards/common/nucleo/include/arduino_pinmap.h
similarity index 100%
rename from boards/nucleo-common/include/arduino_pinmap.h
rename to boards/common/nucleo/include/arduino_pinmap.h
diff --git a/boards/nucleo-common/include/board_common.h b/boards/common/nucleo/include/board_common.h
similarity index 100%
rename from boards/nucleo-common/include/board_common.h
rename to boards/common/nucleo/include/board_common.h
diff --git a/boards/nucleo-common/include/gpio_params.h b/boards/common/nucleo/include/gpio_params.h
similarity index 100%
rename from boards/nucleo-common/include/gpio_params.h
rename to boards/common/nucleo/include/gpio_params.h
diff --git a/boards/nucleo-common/Makefile.include b/boards/nucleo-common/Makefile.include
deleted file mode 100644
index 1d6f7deea8..0000000000
--- a/boards/nucleo-common/Makefile.include
+++ /dev/null
@@ -1,5 +0,0 @@
-# include nucleo common serial configuration
-include $(RIOTBOARD)/nucleo-common/Makefile.include.serial
-
-# add the common header files to the include path
-INCLUDES += -I$(RIOTBOARD)/nucleo-common/include
diff --git a/boards/nucleo-f030/Makefile.dep b/boards/nucleo-f030/Makefile.dep
index 76e2dc17b4..7294858272 100644
--- a/boards/nucleo-f030/Makefile.dep
+++ b/boards/nucleo-f030/Makefile.dep
@@ -1 +1 @@
-include $(RIOTBOARD)/nucleo-common/Makefile.dep
+include $(RIOTBOARD)/common/nucleo/Makefile.dep
diff --git a/boards/nucleo-f030/Makefile.features b/boards/nucleo-f030/Makefile.features
index ac926da156..01698fe254 100644
--- a/boards/nucleo-f030/Makefile.features
+++ b/boards/nucleo-f030/Makefile.features
@@ -7,7 +7,7 @@ FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
 
 # load the common Makefile.features for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.features
+include $(RIOTBOARD)/common/nucleo/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_1
diff --git a/boards/nucleo-f030/Makefile.include b/boards/nucleo-f030/Makefile.include
index 7f46635918..8c0f845a9a 100644
--- a/boards/nucleo-f030/Makefile.include
+++ b/boards/nucleo-f030/Makefile.include
@@ -3,4 +3,4 @@ export CPU = stm32f0
 export CPU_MODEL = stm32f030r8
 
 # load the common Makefile.include for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.include
+include $(RIOTBOARD)/common/nucleo/Makefile.include
diff --git a/boards/nucleo-f070/Makefile.dep b/boards/nucleo-f070/Makefile.dep
index 76e2dc17b4..7294858272 100644
--- a/boards/nucleo-f070/Makefile.dep
+++ b/boards/nucleo-f070/Makefile.dep
@@ -1 +1 @@
-include $(RIOTBOARD)/nucleo-common/Makefile.dep
+include $(RIOTBOARD)/common/nucleo/Makefile.dep
diff --git a/boards/nucleo-f070/Makefile.features b/boards/nucleo-f070/Makefile.features
index ac926da156..01698fe254 100644
--- a/boards/nucleo-f070/Makefile.features
+++ b/boards/nucleo-f070/Makefile.features
@@ -7,7 +7,7 @@ FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
 
 # load the common Makefile.features for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.features
+include $(RIOTBOARD)/common/nucleo/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_1
diff --git a/boards/nucleo-f070/Makefile.include b/boards/nucleo-f070/Makefile.include
index 02aa57f43a..99e836bb77 100644
--- a/boards/nucleo-f070/Makefile.include
+++ b/boards/nucleo-f070/Makefile.include
@@ -3,4 +3,4 @@ export CPU = stm32f0
 export CPU_MODEL = stm32f070rb
 
 # load the common Makefile.include for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.include
+include $(RIOTBOARD)/common/nucleo/Makefile.include
diff --git a/boards/nucleo-f072/Makefile.dep b/boards/nucleo-f072/Makefile.dep
index 76e2dc17b4..7294858272 100644
--- a/boards/nucleo-f072/Makefile.dep
+++ b/boards/nucleo-f072/Makefile.dep
@@ -1 +1 @@
-include $(RIOTBOARD)/nucleo-common/Makefile.dep
+include $(RIOTBOARD)/common/nucleo/Makefile.dep
diff --git a/boards/nucleo-f072/Makefile.features b/boards/nucleo-f072/Makefile.features
index 51410f1e7b..81e6fe26cb 100644
--- a/boards/nucleo-f072/Makefile.features
+++ b/boards/nucleo-f072/Makefile.features
@@ -8,7 +8,7 @@ FEATURES_PROVIDED += periph_uart
 FEATURES_PROVIDED += periph_spi
 
 # load the common Makefile.features for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.features
+include $(RIOTBOARD)/common/nucleo/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_1
diff --git a/boards/nucleo-f072/Makefile.include b/boards/nucleo-f072/Makefile.include
index e8fd3d77dc..ee50ffc82e 100644
--- a/boards/nucleo-f072/Makefile.include
+++ b/boards/nucleo-f072/Makefile.include
@@ -3,4 +3,4 @@ export CPU = stm32f0
 export CPU_MODEL = stm32f072rb
 
 # load the common Makefile.include for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.include
+include $(RIOTBOARD)/common/nucleo/Makefile.include
diff --git a/boards/nucleo-f091/Makefile.dep b/boards/nucleo-f091/Makefile.dep
index 76e2dc17b4..7294858272 100644
--- a/boards/nucleo-f091/Makefile.dep
+++ b/boards/nucleo-f091/Makefile.dep
@@ -1 +1 @@
-include $(RIOTBOARD)/nucleo-common/Makefile.dep
+include $(RIOTBOARD)/common/nucleo/Makefile.dep
diff --git a/boards/nucleo-f091/Makefile.features b/boards/nucleo-f091/Makefile.features
index 51410f1e7b..81e6fe26cb 100644
--- a/boards/nucleo-f091/Makefile.features
+++ b/boards/nucleo-f091/Makefile.features
@@ -8,7 +8,7 @@ FEATURES_PROVIDED += periph_uart
 FEATURES_PROVIDED += periph_spi
 
 # load the common Makefile.features for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.features
+include $(RIOTBOARD)/common/nucleo/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_1
diff --git a/boards/nucleo-f091/Makefile.include b/boards/nucleo-f091/Makefile.include
index 46a891574b..5e8cad6863 100644
--- a/boards/nucleo-f091/Makefile.include
+++ b/boards/nucleo-f091/Makefile.include
@@ -3,4 +3,4 @@ export CPU = stm32f0
 export CPU_MODEL = stm32f091rc
 
 # load the common Makefile.include for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.include
+include $(RIOTBOARD)/common/nucleo/Makefile.include
diff --git a/boards/nucleo-f103/Makefile.dep b/boards/nucleo-f103/Makefile.dep
index 76e2dc17b4..7294858272 100644
--- a/boards/nucleo-f103/Makefile.dep
+++ b/boards/nucleo-f103/Makefile.dep
@@ -1 +1 @@
-include $(RIOTBOARD)/nucleo-common/Makefile.dep
+include $(RIOTBOARD)/common/nucleo/Makefile.dep
diff --git a/boards/nucleo-f103/Makefile.features b/boards/nucleo-f103/Makefile.features
index 0cc72d3f1a..8e8843d5e4 100644
--- a/boards/nucleo-f103/Makefile.features
+++ b/boards/nucleo-f103/Makefile.features
@@ -6,7 +6,7 @@ FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
 
 # load the common Makefile.features for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.features
+include $(RIOTBOARD)/common/nucleo/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_1
diff --git a/boards/nucleo-f103/Makefile.include b/boards/nucleo-f103/Makefile.include
index 1fe6635a94..de63a919b9 100644
--- a/boards/nucleo-f103/Makefile.include
+++ b/boards/nucleo-f103/Makefile.include
@@ -3,4 +3,4 @@ export CPU = stm32f1
 export CPU_MODEL = stm32f103rb
 
 # load the common Makefile.include for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.include
+include $(RIOTBOARD)/common/nucleo/Makefile.include
diff --git a/boards/nucleo-f302/Makefile.dep b/boards/nucleo-f302/Makefile.dep
index 76e2dc17b4..7294858272 100644
--- a/boards/nucleo-f302/Makefile.dep
+++ b/boards/nucleo-f302/Makefile.dep
@@ -1 +1 @@
-include $(RIOTBOARD)/nucleo-common/Makefile.dep
+include $(RIOTBOARD)/common/nucleo/Makefile.dep
diff --git a/boards/nucleo-f302/Makefile.features b/boards/nucleo-f302/Makefile.features
index 87b91a8272..d761bf567a 100644
--- a/boards/nucleo-f302/Makefile.features
+++ b/boards/nucleo-f302/Makefile.features
@@ -8,7 +8,7 @@ FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
 
 # load the common Makefile.features for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.features
+include $(RIOTBOARD)/common/nucleo/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_2
diff --git a/boards/nucleo-f302/Makefile.include b/boards/nucleo-f302/Makefile.include
index 2495336993..6d4d2e4035 100644
--- a/boards/nucleo-f302/Makefile.include
+++ b/boards/nucleo-f302/Makefile.include
@@ -3,4 +3,4 @@ export CPU = stm32f3
 export CPU_MODEL = stm32f302r8
 
 # load the common Makefile.include for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.include
+include $(RIOTBOARD)/common/nucleo/Makefile.include
diff --git a/boards/nucleo-f303/Makefile.dep b/boards/nucleo-f303/Makefile.dep
index 76e2dc17b4..7294858272 100644
--- a/boards/nucleo-f303/Makefile.dep
+++ b/boards/nucleo-f303/Makefile.dep
@@ -1 +1 @@
-include $(RIOTBOARD)/nucleo-common/Makefile.dep
+include $(RIOTBOARD)/common/nucleo/Makefile.dep
diff --git a/boards/nucleo-f303/Makefile.features b/boards/nucleo-f303/Makefile.features
index 87b91a8272..d761bf567a 100644
--- a/boards/nucleo-f303/Makefile.features
+++ b/boards/nucleo-f303/Makefile.features
@@ -8,7 +8,7 @@ FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
 
 # load the common Makefile.features for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.features
+include $(RIOTBOARD)/common/nucleo/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_2
diff --git a/boards/nucleo-f303/Makefile.include b/boards/nucleo-f303/Makefile.include
index c37c350a99..723f72fb62 100644
--- a/boards/nucleo-f303/Makefile.include
+++ b/boards/nucleo-f303/Makefile.include
@@ -3,4 +3,4 @@ export CPU = stm32f3
 export CPU_MODEL = stm32f303re
 
 # load the common Makefile.include for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.include
+include $(RIOTBOARD)/common/nucleo/Makefile.include
diff --git a/boards/nucleo-f334/Makefile.dep b/boards/nucleo-f334/Makefile.dep
index 76e2dc17b4..7294858272 100644
--- a/boards/nucleo-f334/Makefile.dep
+++ b/boards/nucleo-f334/Makefile.dep
@@ -1 +1 @@
-include $(RIOTBOARD)/nucleo-common/Makefile.dep
+include $(RIOTBOARD)/common/nucleo/Makefile.dep
diff --git a/boards/nucleo-f334/Makefile.features b/boards/nucleo-f334/Makefile.features
index 0c6296c361..84fb8df11e 100644
--- a/boards/nucleo-f334/Makefile.features
+++ b/boards/nucleo-f334/Makefile.features
@@ -7,7 +7,7 @@ FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
 
 # load the common Makefile.features for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.features
+include $(RIOTBOARD)/common/nucleo/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_2
diff --git a/boards/nucleo-f334/Makefile.include b/boards/nucleo-f334/Makefile.include
index 108e978264..41809262c5 100644
--- a/boards/nucleo-f334/Makefile.include
+++ b/boards/nucleo-f334/Makefile.include
@@ -3,4 +3,4 @@ export CPU = stm32f3
 export CPU_MODEL = stm32f334r8
 
 # load the common Makefile.include for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.include
+include $(RIOTBOARD)/common/nucleo/Makefile.include
diff --git a/boards/nucleo-f401/Makefile.dep b/boards/nucleo-f401/Makefile.dep
index 76e2dc17b4..7294858272 100644
--- a/boards/nucleo-f401/Makefile.dep
+++ b/boards/nucleo-f401/Makefile.dep
@@ -1 +1 @@
-include $(RIOTBOARD)/nucleo-common/Makefile.dep
+include $(RIOTBOARD)/common/nucleo/Makefile.dep
diff --git a/boards/nucleo-f401/Makefile.features b/boards/nucleo-f401/Makefile.features
index 5f6a656dcb..10ffdd68dd 100644
--- a/boards/nucleo-f401/Makefile.features
+++ b/boards/nucleo-f401/Makefile.features
@@ -9,7 +9,7 @@ FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
 
 # load the common Makefile.features for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.features
+include $(RIOTBOARD)/common/nucleo/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_3
diff --git a/boards/nucleo-f401/Makefile.include b/boards/nucleo-f401/Makefile.include
index 30cc7a5ba9..4a63668cf1 100644
--- a/boards/nucleo-f401/Makefile.include
+++ b/boards/nucleo-f401/Makefile.include
@@ -3,4 +3,4 @@ export CPU = stm32f4
 export CPU_MODEL = stm32f401re
 
 # load the common Makefile.include for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.include
+include $(RIOTBOARD)/common/nucleo/Makefile.include
diff --git a/boards/nucleo-f410/Makefile.dep b/boards/nucleo-f410/Makefile.dep
index 76e2dc17b4..7294858272 100644
--- a/boards/nucleo-f410/Makefile.dep
+++ b/boards/nucleo-f410/Makefile.dep
@@ -1 +1 @@
-include $(RIOTBOARD)/nucleo-common/Makefile.dep
+include $(RIOTBOARD)/common/nucleo/Makefile.dep
diff --git a/boards/nucleo-f410/Makefile.include b/boards/nucleo-f410/Makefile.include
index d79b8dfa71..b3d4a910d1 100644
--- a/boards/nucleo-f410/Makefile.include
+++ b/boards/nucleo-f410/Makefile.include
@@ -3,4 +3,4 @@ export CPU = stm32f4
 export CPU_MODEL = stm32f410rb
 
 # load the common Makefile.include for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.include
+include $(RIOTBOARD)/common/nucleo/Makefile.include
diff --git a/boards/nucleo-f411/Makefile.dep b/boards/nucleo-f411/Makefile.dep
index 76e2dc17b4..7294858272 100644
--- a/boards/nucleo-f411/Makefile.dep
+++ b/boards/nucleo-f411/Makefile.dep
@@ -1 +1 @@
-include $(RIOTBOARD)/nucleo-common/Makefile.dep
+include $(RIOTBOARD)/common/nucleo/Makefile.dep
diff --git a/boards/nucleo-f411/Makefile.include b/boards/nucleo-f411/Makefile.include
index 42b62b6cd0..70a5d0a199 100644
--- a/boards/nucleo-f411/Makefile.include
+++ b/boards/nucleo-f411/Makefile.include
@@ -3,4 +3,4 @@ export CPU = stm32f4
 export CPU_MODEL = stm32f411re
 
 # load the common Makefile.include for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.include
+include $(RIOTBOARD)/common/nucleo/Makefile.include
diff --git a/boards/nucleo-f446/Makefile.dep b/boards/nucleo-f446/Makefile.dep
index 76e2dc17b4..7294858272 100644
--- a/boards/nucleo-f446/Makefile.dep
+++ b/boards/nucleo-f446/Makefile.dep
@@ -1 +1 @@
-include $(RIOTBOARD)/nucleo-common/Makefile.dep
+include $(RIOTBOARD)/common/nucleo/Makefile.dep
diff --git a/boards/nucleo-f446/Makefile.features b/boards/nucleo-f446/Makefile.features
index 5f6a656dcb..10ffdd68dd 100644
--- a/boards/nucleo-f446/Makefile.features
+++ b/boards/nucleo-f446/Makefile.features
@@ -9,7 +9,7 @@ FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
 
 # load the common Makefile.features for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.features
+include $(RIOTBOARD)/common/nucleo/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_3
diff --git a/boards/nucleo-f446/Makefile.include b/boards/nucleo-f446/Makefile.include
index 00919b1616..332851abc3 100644
--- a/boards/nucleo-f446/Makefile.include
+++ b/boards/nucleo-f446/Makefile.include
@@ -3,4 +3,4 @@ export CPU = stm32f4
 export CPU_MODEL = stm32f446re
 
 # load the common Makefile.include for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.include
+include $(RIOTBOARD)/common/nucleo/Makefile.include
diff --git a/boards/nucleo-l053/Makefile.dep b/boards/nucleo-l053/Makefile.dep
index 76e2dc17b4..7294858272 100644
--- a/boards/nucleo-l053/Makefile.dep
+++ b/boards/nucleo-l053/Makefile.dep
@@ -1 +1 @@
-include $(RIOTBOARD)/nucleo-common/Makefile.dep
+include $(RIOTBOARD)/common/nucleo/Makefile.dep
diff --git a/boards/nucleo-l053/Makefile.features b/boards/nucleo-l053/Makefile.features
index fe1b576a05..d785886eba 100644
--- a/boards/nucleo-l053/Makefile.features
+++ b/boards/nucleo-l053/Makefile.features
@@ -7,7 +7,7 @@ FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
 
 # load the common Makefile.features for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.features
+include $(RIOTBOARD)/common/nucleo/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_1
diff --git a/boards/nucleo-l053/Makefile.include b/boards/nucleo-l053/Makefile.include
index 5128948a0e..e4344de4b8 100644
--- a/boards/nucleo-l053/Makefile.include
+++ b/boards/nucleo-l053/Makefile.include
@@ -3,4 +3,4 @@ export CPU = stm32l0
 export CPU_MODEL = stm32l053r8
 
 # load the common Makefile.include for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.include
+include $(RIOTBOARD)/common/nucleo/Makefile.include
diff --git a/boards/nucleo-l073/Makefile.dep b/boards/nucleo-l073/Makefile.dep
index 76e2dc17b4..7294858272 100644
--- a/boards/nucleo-l073/Makefile.dep
+++ b/boards/nucleo-l073/Makefile.dep
@@ -1 +1 @@
-include $(RIOTBOARD)/nucleo-common/Makefile.dep
+include $(RIOTBOARD)/common/nucleo/Makefile.dep
diff --git a/boards/nucleo-l073/Makefile.features b/boards/nucleo-l073/Makefile.features
index 79e116343a..33fd602785 100644
--- a/boards/nucleo-l073/Makefile.features
+++ b/boards/nucleo-l073/Makefile.features
@@ -9,7 +9,7 @@ FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
 
 # load the common Makefile.features for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.features
+include $(RIOTBOARD)/common/nucleo/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_1
diff --git a/boards/nucleo-l073/Makefile.include b/boards/nucleo-l073/Makefile.include
index 71759157dc..59447c1094 100644
--- a/boards/nucleo-l073/Makefile.include
+++ b/boards/nucleo-l073/Makefile.include
@@ -3,4 +3,4 @@ export CPU = stm32l0
 export CPU_MODEL = stm32l073rz
 
 # load the common Makefile.include for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.include
+include $(RIOTBOARD)/common/nucleo/Makefile.include
diff --git a/boards/nucleo-l152/Makefile.dep b/boards/nucleo-l152/Makefile.dep
index 76e2dc17b4..7294858272 100644
--- a/boards/nucleo-l152/Makefile.dep
+++ b/boards/nucleo-l152/Makefile.dep
@@ -1 +1 @@
-include $(RIOTBOARD)/nucleo-common/Makefile.dep
+include $(RIOTBOARD)/common/nucleo/Makefile.dep
diff --git a/boards/nucleo-l152/Makefile.features b/boards/nucleo-l152/Makefile.features
index 9fcf1a9617..4bc3faf2d4 100644
--- a/boards/nucleo-l152/Makefile.features
+++ b/boards/nucleo-l152/Makefile.features
@@ -10,7 +10,7 @@ FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
 
 # load the common Makefile.features for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.features
+include $(RIOTBOARD)/common/nucleo/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_2
diff --git a/boards/nucleo-l152/Makefile.include b/boards/nucleo-l152/Makefile.include
index 2902085408..5ba7da128f 100644
--- a/boards/nucleo-l152/Makefile.include
+++ b/boards/nucleo-l152/Makefile.include
@@ -3,4 +3,4 @@ export CPU = stm32l1
 export CPU_MODEL = stm32l152ret6
 
 # load the common Makefile.include for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.include
+include $(RIOTBOARD)/common/nucleo/Makefile.include
diff --git a/boards/nucleo-l476/Makefile.dep b/boards/nucleo-l476/Makefile.dep
index 76e2dc17b4..7294858272 100644
--- a/boards/nucleo-l476/Makefile.dep
+++ b/boards/nucleo-l476/Makefile.dep
@@ -1 +1 @@
-include $(RIOTBOARD)/nucleo-common/Makefile.dep
+include $(RIOTBOARD)/common/nucleo/Makefile.dep
diff --git a/boards/nucleo-l476/Makefile.features b/boards/nucleo-l476/Makefile.features
index d1a5906bc0..b4ed73641e 100644
--- a/boards/nucleo-l476/Makefile.features
+++ b/boards/nucleo-l476/Makefile.features
@@ -8,7 +8,7 @@ FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
 
 # load the common Makefile.features for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.features
+include $(RIOTBOARD)/common/nucleo/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_2
diff --git a/boards/nucleo-l476/Makefile.include b/boards/nucleo-l476/Makefile.include
index 7ca5c424a2..a796b9257d 100644
--- a/boards/nucleo-l476/Makefile.include
+++ b/boards/nucleo-l476/Makefile.include
@@ -3,4 +3,4 @@ export CPU = stm32l4
 export CPU_MODEL = stm32l476rg
 
 # load the common Makefile.include for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.include
+include $(RIOTBOARD)/common/nucleo/Makefile.include
-- 
GitLab