From f1135af3d7523a998bef1688fbac799fd3b074c8 Mon Sep 17 00:00:00 2001 From: Hauke Petersen <hauke.petersen@fu-berlin.de> Date: Thu, 16 Nov 2017 12:29:47 +0100 Subject: [PATCH] boards/nucleo144: move shared code to common/nucleo144 --- boards/{nucleo144-common => common/nucleo144}/Makefile | 0 .../{nucleo144-common => common/nucleo144}/Makefile.features | 0 boards/common/nucleo144/Makefile.include | 5 +++++ .../nucleo144}/include/arduino_board.h | 0 .../nucleo144}/include/arduino_pinmap.h | 0 .../nucleo144}/include/board_common.h | 0 .../nucleo144}/include/gpio_params.h | 0 boards/nucleo144-common/Makefile.include | 5 ----- boards/nucleo144-f207/Makefile.dep | 2 +- boards/nucleo144-f207/Makefile.features | 2 +- boards/nucleo144-f207/Makefile.include | 2 +- boards/nucleo144-f303/Makefile.dep | 2 +- boards/nucleo144-f303/Makefile.features | 2 +- boards/nucleo144-f303/Makefile.include | 2 +- boards/nucleo144-f412/Makefile.dep | 2 +- boards/nucleo144-f412/Makefile.features | 2 +- boards/nucleo144-f412/Makefile.include | 2 +- boards/nucleo144-f413/Makefile.dep | 2 +- boards/nucleo144-f413/Makefile.features | 2 +- boards/nucleo144-f413/Makefile.include | 2 +- boards/nucleo144-f429/Makefile.dep | 2 +- boards/nucleo144-f429/Makefile.features | 2 +- boards/nucleo144-f429/Makefile.include | 2 +- boards/nucleo144-f446/Makefile.dep | 2 +- boards/nucleo144-f446/Makefile.features | 2 +- boards/nucleo144-f446/Makefile.include | 2 +- boards/nucleo144-f722/Makefile.dep | 2 +- boards/nucleo144-f722/Makefile.features | 2 +- boards/nucleo144-f722/Makefile.include | 2 +- boards/nucleo144-f746/Makefile.dep | 2 +- boards/nucleo144-f746/Makefile.features | 2 +- boards/nucleo144-f746/Makefile.include | 2 +- boards/nucleo144-f767/Makefile.dep | 2 +- boards/nucleo144-f767/Makefile.features | 2 +- boards/nucleo144-f767/Makefile.include | 2 +- 35 files changed, 32 insertions(+), 32 deletions(-) rename boards/{nucleo144-common => common/nucleo144}/Makefile (100%) rename boards/{nucleo144-common => common/nucleo144}/Makefile.features (100%) create mode 100644 boards/common/nucleo144/Makefile.include rename boards/{nucleo144-common => common/nucleo144}/include/arduino_board.h (100%) rename boards/{nucleo144-common => common/nucleo144}/include/arduino_pinmap.h (100%) rename boards/{nucleo144-common => common/nucleo144}/include/board_common.h (100%) rename boards/{nucleo144-common => common/nucleo144}/include/gpio_params.h (100%) delete mode 100644 boards/nucleo144-common/Makefile.include diff --git a/boards/nucleo144-common/Makefile b/boards/common/nucleo144/Makefile similarity index 100% rename from boards/nucleo144-common/Makefile rename to boards/common/nucleo144/Makefile diff --git a/boards/nucleo144-common/Makefile.features b/boards/common/nucleo144/Makefile.features similarity index 100% rename from boards/nucleo144-common/Makefile.features rename to boards/common/nucleo144/Makefile.features diff --git a/boards/common/nucleo144/Makefile.include b/boards/common/nucleo144/Makefile.include new file mode 100644 index 0000000000..64c4ada071 --- /dev/null +++ b/boards/common/nucleo144/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/nucleo144/include diff --git a/boards/nucleo144-common/include/arduino_board.h b/boards/common/nucleo144/include/arduino_board.h similarity index 100% rename from boards/nucleo144-common/include/arduino_board.h rename to boards/common/nucleo144/include/arduino_board.h diff --git a/boards/nucleo144-common/include/arduino_pinmap.h b/boards/common/nucleo144/include/arduino_pinmap.h similarity index 100% rename from boards/nucleo144-common/include/arduino_pinmap.h rename to boards/common/nucleo144/include/arduino_pinmap.h diff --git a/boards/nucleo144-common/include/board_common.h b/boards/common/nucleo144/include/board_common.h similarity index 100% rename from boards/nucleo144-common/include/board_common.h rename to boards/common/nucleo144/include/board_common.h diff --git a/boards/nucleo144-common/include/gpio_params.h b/boards/common/nucleo144/include/gpio_params.h similarity index 100% rename from boards/nucleo144-common/include/gpio_params.h rename to boards/common/nucleo144/include/gpio_params.h diff --git a/boards/nucleo144-common/Makefile.include b/boards/nucleo144-common/Makefile.include deleted file mode 100644 index fd1c1a915e..0000000000 --- a/boards/nucleo144-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)/nucleo144-common/include diff --git a/boards/nucleo144-f207/Makefile.dep b/boards/nucleo144-f207/Makefile.dep index 76e2dc17b4..7294858272 100644 --- a/boards/nucleo144-f207/Makefile.dep +++ b/boards/nucleo144-f207/Makefile.dep @@ -1 +1 @@ -include $(RIOTBOARD)/nucleo-common/Makefile.dep +include $(RIOTBOARD)/common/nucleo/Makefile.dep diff --git a/boards/nucleo144-f207/Makefile.features b/boards/nucleo144-f207/Makefile.features index eeae79b3ad..66d641cc89 100644 --- a/boards/nucleo144-f207/Makefile.features +++ b/boards/nucleo144-f207/Makefile.features @@ -8,7 +8,7 @@ FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart # load the common Makefile.features for Nucleo-144 boards -include $(RIOTBOARD)/nucleo144-common/Makefile.features +include $(RIOTBOARD)/common/nucleo144/Makefile.features # The board MPU family (used for grouping by the CI system) FEATURES_MCU_GROUP = cortex_m3_2 diff --git a/boards/nucleo144-f207/Makefile.include b/boards/nucleo144-f207/Makefile.include index 1c1ead3e02..bd9a129dd7 100644 --- a/boards/nucleo144-f207/Makefile.include +++ b/boards/nucleo144-f207/Makefile.include @@ -3,4 +3,4 @@ export CPU = stm32f2 export CPU_MODEL = stm32f207zg # load the common Makefile.include for Nucleo-144 boards -include $(RIOTBOARD)/nucleo144-common/Makefile.include +include $(RIOTBOARD)/common/nucleo144/Makefile.include diff --git a/boards/nucleo144-f303/Makefile.dep b/boards/nucleo144-f303/Makefile.dep index 76e2dc17b4..7294858272 100644 --- a/boards/nucleo144-f303/Makefile.dep +++ b/boards/nucleo144-f303/Makefile.dep @@ -1 +1 @@ -include $(RIOTBOARD)/nucleo-common/Makefile.dep +include $(RIOTBOARD)/common/nucleo/Makefile.dep diff --git a/boards/nucleo144-f303/Makefile.features b/boards/nucleo144-f303/Makefile.features index d9a523201e..3e90c05d1e 100644 --- a/boards/nucleo144-f303/Makefile.features +++ b/boards/nucleo144-f303/Makefile.features @@ -7,7 +7,7 @@ FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart # load the common Makefile.features for Nucleo 144 boards -include $(RIOTBOARD)/nucleo144-common/Makefile.features +include $(RIOTBOARD)/common/nucleo144/Makefile.features # The board MPU family (used for grouping by the CI system) FEATURES_MCU_GROUP = cortex_m4_3 diff --git a/boards/nucleo144-f303/Makefile.include b/boards/nucleo144-f303/Makefile.include index 49e05545b7..f805e3f6d0 100644 --- a/boards/nucleo144-f303/Makefile.include +++ b/boards/nucleo144-f303/Makefile.include @@ -3,4 +3,4 @@ export CPU = stm32f3 export CPU_MODEL = stm32f303ze # load the common Makefile.include for Nucleo-144 boards -include $(RIOTBOARD)/nucleo144-common/Makefile.include +include $(RIOTBOARD)/common/nucleo144/Makefile.include diff --git a/boards/nucleo144-f412/Makefile.dep b/boards/nucleo144-f412/Makefile.dep index 76e2dc17b4..7294858272 100644 --- a/boards/nucleo144-f412/Makefile.dep +++ b/boards/nucleo144-f412/Makefile.dep @@ -1 +1 @@ -include $(RIOTBOARD)/nucleo-common/Makefile.dep +include $(RIOTBOARD)/common/nucleo/Makefile.dep diff --git a/boards/nucleo144-f412/Makefile.features b/boards/nucleo144-f412/Makefile.features index d256e7967d..7e81643a3e 100644 --- a/boards/nucleo144-f412/Makefile.features +++ b/boards/nucleo144-f412/Makefile.features @@ -9,7 +9,7 @@ FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart # load the common Makefile.features for Nucleo-144 boards -include $(RIOTBOARD)/nucleo144-common/Makefile.features +include $(RIOTBOARD)/common/nucleo144/Makefile.features # The board MPU family (used for grouping by the CI system) FEATURES_MCU_GROUP = cortex_m4_3 diff --git a/boards/nucleo144-f412/Makefile.include b/boards/nucleo144-f412/Makefile.include index c97906ebe0..95c504d567 100644 --- a/boards/nucleo144-f412/Makefile.include +++ b/boards/nucleo144-f412/Makefile.include @@ -3,4 +3,4 @@ export CPU = stm32f4 export CPU_MODEL = stm32f412zg # load the common Makefile.include for Nucleo-144 boards -include $(RIOTBOARD)/nucleo144-common/Makefile.include +include $(RIOTBOARD)/common/nucleo144/Makefile.include diff --git a/boards/nucleo144-f413/Makefile.dep b/boards/nucleo144-f413/Makefile.dep index 76e2dc17b4..7294858272 100644 --- a/boards/nucleo144-f413/Makefile.dep +++ b/boards/nucleo144-f413/Makefile.dep @@ -1 +1 @@ -include $(RIOTBOARD)/nucleo-common/Makefile.dep +include $(RIOTBOARD)/common/nucleo/Makefile.dep diff --git a/boards/nucleo144-f413/Makefile.features b/boards/nucleo144-f413/Makefile.features index c0023b9ac2..7041868778 100644 --- a/boards/nucleo144-f413/Makefile.features +++ b/boards/nucleo144-f413/Makefile.features @@ -9,7 +9,7 @@ FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart # load the common Makefile.features for Nucleo boards -include $(RIOTBOARD)/nucleo144-common/Makefile.features +include $(RIOTBOARD)/common/nucleo144/Makefile.features # The board MPU family (used for grouping by the CI system) FEATURES_MCU_GROUP = cortex_m4_3 diff --git a/boards/nucleo144-f413/Makefile.include b/boards/nucleo144-f413/Makefile.include index bb914e66f2..2c9bf06919 100644 --- a/boards/nucleo144-f413/Makefile.include +++ b/boards/nucleo144-f413/Makefile.include @@ -3,4 +3,4 @@ export CPU = stm32f4 export CPU_MODEL = stm32f413zh # load the common Makefile.include for Nucleo-144 boards -include $(RIOTBOARD)/nucleo144-common/Makefile.include +include $(RIOTBOARD)/common/nucleo144/Makefile.include diff --git a/boards/nucleo144-f429/Makefile.dep b/boards/nucleo144-f429/Makefile.dep index 76e2dc17b4..7294858272 100644 --- a/boards/nucleo144-f429/Makefile.dep +++ b/boards/nucleo144-f429/Makefile.dep @@ -1 +1 @@ -include $(RIOTBOARD)/nucleo-common/Makefile.dep +include $(RIOTBOARD)/common/nucleo/Makefile.dep diff --git a/boards/nucleo144-f429/Makefile.features b/boards/nucleo144-f429/Makefile.features index c0023b9ac2..7041868778 100644 --- a/boards/nucleo144-f429/Makefile.features +++ b/boards/nucleo144-f429/Makefile.features @@ -9,7 +9,7 @@ FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart # load the common Makefile.features for Nucleo boards -include $(RIOTBOARD)/nucleo144-common/Makefile.features +include $(RIOTBOARD)/common/nucleo144/Makefile.features # The board MPU family (used for grouping by the CI system) FEATURES_MCU_GROUP = cortex_m4_3 diff --git a/boards/nucleo144-f429/Makefile.include b/boards/nucleo144-f429/Makefile.include index b45202174b..b1a0841ff6 100644 --- a/boards/nucleo144-f429/Makefile.include +++ b/boards/nucleo144-f429/Makefile.include @@ -3,4 +3,4 @@ export CPU = stm32f4 export CPU_MODEL = stm32f429zi # load the common Makefile.include for Nucleo-144 boards -include $(RIOTBOARD)/nucleo144-common/Makefile.include +include $(RIOTBOARD)/common/nucleo144/Makefile.include diff --git a/boards/nucleo144-f446/Makefile.dep b/boards/nucleo144-f446/Makefile.dep index 76e2dc17b4..7294858272 100644 --- a/boards/nucleo144-f446/Makefile.dep +++ b/boards/nucleo144-f446/Makefile.dep @@ -1 +1 @@ -include $(RIOTBOARD)/nucleo-common/Makefile.dep +include $(RIOTBOARD)/common/nucleo/Makefile.dep diff --git a/boards/nucleo144-f446/Makefile.features b/boards/nucleo144-f446/Makefile.features index dbedb27557..3c0a5eacfc 100644 --- a/boards/nucleo144-f446/Makefile.features +++ b/boards/nucleo144-f446/Makefile.features @@ -8,7 +8,7 @@ FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart # load the common Makefile.features for Nucleo boards -include $(RIOTBOARD)/nucleo144-common/Makefile.features +include $(RIOTBOARD)/common/nucleo144/Makefile.features # The board MPU family (used for grouping by the CI system) FEATURES_MCU_GROUP = cortex_m4_3 diff --git a/boards/nucleo144-f446/Makefile.include b/boards/nucleo144-f446/Makefile.include index 12efc2b3a8..4e2567a435 100644 --- a/boards/nucleo144-f446/Makefile.include +++ b/boards/nucleo144-f446/Makefile.include @@ -3,4 +3,4 @@ export CPU = stm32f4 export CPU_MODEL = stm32f446ze # load the common Makefile.include for Nucleo-144 boards -include $(RIOTBOARD)/nucleo144-common/Makefile.include +include $(RIOTBOARD)/common/nucleo144/Makefile.include diff --git a/boards/nucleo144-f722/Makefile.dep b/boards/nucleo144-f722/Makefile.dep index 76e2dc17b4..7294858272 100644 --- a/boards/nucleo144-f722/Makefile.dep +++ b/boards/nucleo144-f722/Makefile.dep @@ -1 +1 @@ -include $(RIOTBOARD)/nucleo-common/Makefile.dep +include $(RIOTBOARD)/common/nucleo/Makefile.dep diff --git a/boards/nucleo144-f722/Makefile.features b/boards/nucleo144-f722/Makefile.features index 4b922dc34d..1d3e51ef50 100644 --- a/boards/nucleo144-f722/Makefile.features +++ b/boards/nucleo144-f722/Makefile.features @@ -5,7 +5,7 @@ FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart # load the common Makefile.features for Nucleo144 boards -include $(RIOTBOARD)/nucleo144-common/Makefile.features +include $(RIOTBOARD)/common/nucleo144/Makefile.features # The board MPU family (used for grouping by the CI system) FEATURES_MCU_GROUP = cortex_m7 diff --git a/boards/nucleo144-f722/Makefile.include b/boards/nucleo144-f722/Makefile.include index 495043d0c3..4c59a5e1ed 100644 --- a/boards/nucleo144-f722/Makefile.include +++ b/boards/nucleo144-f722/Makefile.include @@ -3,4 +3,4 @@ export CPU = stm32f7 export CPU_MODEL = stm32f722ze # load the common Makefile.include for Nucleo144 boards -include $(RIOTBOARD)/nucleo144-common/Makefile.include +include $(RIOTBOARD)/common/nucleo144/Makefile.include diff --git a/boards/nucleo144-f746/Makefile.dep b/boards/nucleo144-f746/Makefile.dep index 76e2dc17b4..7294858272 100644 --- a/boards/nucleo144-f746/Makefile.dep +++ b/boards/nucleo144-f746/Makefile.dep @@ -1 +1 @@ -include $(RIOTBOARD)/nucleo-common/Makefile.dep +include $(RIOTBOARD)/common/nucleo/Makefile.dep diff --git a/boards/nucleo144-f746/Makefile.features b/boards/nucleo144-f746/Makefile.features index 24128e83da..ed5b86f289 100644 --- a/boards/nucleo144-f746/Makefile.features +++ b/boards/nucleo144-f746/Makefile.features @@ -5,7 +5,7 @@ FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart # load the common Makefile.features for Nucleo boards -include $(RIOTBOARD)/nucleo144-common/Makefile.features +include $(RIOTBOARD)/common/nucleo144/Makefile.features # The board MPU family (used for grouping by the CI system) FEATURES_MCU_GROUP = cortex_m7 diff --git a/boards/nucleo144-f746/Makefile.include b/boards/nucleo144-f746/Makefile.include index a588bd7dbc..052e2be5dd 100644 --- a/boards/nucleo144-f746/Makefile.include +++ b/boards/nucleo144-f746/Makefile.include @@ -3,4 +3,4 @@ export CPU = stm32f7 export CPU_MODEL = stm32f746zg # load the common Makefile.include for Nucleo boards -include $(RIOTBOARD)/nucleo144-common/Makefile.include +include $(RIOTBOARD)/common/nucleo144/Makefile.include diff --git a/boards/nucleo144-f767/Makefile.dep b/boards/nucleo144-f767/Makefile.dep index 76e2dc17b4..7294858272 100644 --- a/boards/nucleo144-f767/Makefile.dep +++ b/boards/nucleo144-f767/Makefile.dep @@ -1 +1 @@ -include $(RIOTBOARD)/nucleo-common/Makefile.dep +include $(RIOTBOARD)/common/nucleo/Makefile.dep diff --git a/boards/nucleo144-f767/Makefile.features b/boards/nucleo144-f767/Makefile.features index 24128e83da..ed5b86f289 100644 --- a/boards/nucleo144-f767/Makefile.features +++ b/boards/nucleo144-f767/Makefile.features @@ -5,7 +5,7 @@ FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart # load the common Makefile.features for Nucleo boards -include $(RIOTBOARD)/nucleo144-common/Makefile.features +include $(RIOTBOARD)/common/nucleo144/Makefile.features # The board MPU family (used for grouping by the CI system) FEATURES_MCU_GROUP = cortex_m7 diff --git a/boards/nucleo144-f767/Makefile.include b/boards/nucleo144-f767/Makefile.include index caf834742b..fc967abf5e 100644 --- a/boards/nucleo144-f767/Makefile.include +++ b/boards/nucleo144-f767/Makefile.include @@ -3,4 +3,4 @@ export CPU = stm32f7 export CPU_MODEL = stm32f767zi # load the common Makefile.include for Nucleo boards -include $(RIOTBOARD)/nucleo144-common/Makefile.include +include $(RIOTBOARD)/common/nucleo144/Makefile.include -- GitLab