Merge pull request #12343 from cladmi/pr/board/slwstk6000b/split

boards/slwstk6000b-*: split one board for each module
RIOT-OS · Oct 8, 2019 · 94e0032 · 94e0032
2 parents c20199c + 1ab5a93
commit 94e0032
Show file tree

Hide file tree

Showing 26 changed files with 44 additions and 18 deletions.
diff --git a/boards/slwstk6000b/Makefile → boards/common/slwstk6000b/Makefile b/boards/slwstk6000b/Makefile → boards/common/slwstk6000b/Makefile
@@ -1,4 +1,4 @@
-MODULE = board
+MODULE = board_common_slwstk6000b
 
 DIRS = $(RIOTBOARD)/common/silabs
 

diff --git a/boards/slwstk6000b/Makefile.dep → boards/common/slwstk6000b/Makefile.dep b/boards/slwstk6000b/Makefile.dep → boards/common/slwstk6000b/Makefile.dep
diff --git a/boards/slwstk6000b/Makefile.features → boards/common/slwstk6000b/Makefile.features b/boards/slwstk6000b/Makefile.features → boards/common/slwstk6000b/Makefile.features
diff --git a/boards/slwstk6000b/Makefile.include → boards/common/slwstk6000b/Makefile.include b/boards/slwstk6000b/Makefile.include → boards/common/slwstk6000b/Makefile.include
@@ -1,7 +1,8 @@
-include $(RIOTBOARD)/slwstk6000b/module-info.mk
+include $(RIOTBOARD)/common/slwstk6000b/module-info.mk
 
+INCLUDES += -I$(RIOTBOARD)/common/slwstk6000b/include
 # add module specific includes
-INCLUDES += -I$(RIOTBOARD)/slwstk6000b/modules/$(BOARD_MODULE)/include
+INCLUDES += -I$(RIOTBOARD)/common/slwstk6000b/modules/$(BOARD_MODULE)/include
 
 export CPU_MODEL = $(MODULE_CPU)
 

diff --git a/boards/slwstk6000b/board.c → boards/common/slwstk6000b/board.c b/boards/slwstk6000b/board.c → boards/common/slwstk6000b/board.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     boards_slwstk6000b
+ * @ingroup     boards_common_slwstk6000b
  * @{
  *
  * @file

diff --git a/boards/slwstk6000b/include/board.h → boards/common/slwstk6000b/include/board.h b/boards/slwstk6000b/include/board.h → boards/common/slwstk6000b/include/board.h
@@ -7,7 +7,7 @@
  */
 
 /**
- * @defgroup    boards_slwstk6000b Silicon Labs SLWSTK6000B starter kit
+ * @defgroup    boards_common_slwstk6000b Silicon Labs SLWSTK6000B starter kit
  * @ingroup     boards
  * @brief       Support for the Silicon Labs SLWSTK6000B starter kit
  * @{

diff --git a/boards/slwstk6000b/include/gpio_params.h → .../common/slwstk6000b/include/gpio_params.h b/boards/slwstk6000b/include/gpio_params.h → .../common/slwstk6000b/include/gpio_params.h
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     boards_slwstk6000b
+ * @ingroup     boards_common_slwstk6000b
  * @{
  *
  * @file

diff --git a/boards/slwstk6000b/include/periph_conf.h → .../common/slwstk6000b/include/periph_conf.h b/boards/slwstk6000b/include/periph_conf.h → .../common/slwstk6000b/include/periph_conf.h
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     boards_slwstk6000b
+ * @ingroup     boards_common_slwstk6000b
  * @{
  *
  * @file

diff --git a/boards/slwstk6000b/module-info.mk → boards/common/slwstk6000b/module-info.mk b/boards/slwstk6000b/module-info.mk → boards/common/slwstk6000b/module-info.mk
@@ -1,15 +1,16 @@
-# Define the default board module.
-BOARD_MODULE ?= slwrb4162a
+ifeq (,$(BOARD_MODULE))
+  $(error Board module must be defined in $(BOARD_MODULE))
+endif
 
 # Find the header file that should exist if the module is supported.
-MODULE_HEADER = $(wildcard $(RIOTBOARD)/slwstk6000b/modules/$(BOARD_MODULE)/include/board_module.h)
+MODULE_HEADER = $(wildcard $(RIOTBOARD)/common/slwstk6000b/modules/$(BOARD_MODULE)/include/board_module.h)
 
 ifeq (,$(MODULE_HEADER))
   $(error Header file for $(BOARD_MODULE) is missing)
 endif
 
 # Lookup up CPU information using grep.
-MODULE_INFO = $(shell grep $(BOARD_MODULE) $(RIOTBOARD)/slwstk6000b/modules.txt)
+MODULE_INFO = $(shell grep $(BOARD_MODULE) $(RIOTBOARD)/common/slwstk6000b/modules.txt)
 
 ifeq (,$(MODULE_INFO))
   $(error Unable to read module information for $(BOARD_MODULE))

diff --git a/boards/slwstk6000b/modules.txt → boards/common/slwstk6000b/modules.txt b/boards/slwstk6000b/modules.txt → boards/common/slwstk6000b/modules.txt
diff --git a/...modules/slwrb4150a/include/board_module.h → ...modules/slwrb4150a/include/board_module.h b/...modules/slwrb4150a/include/board_module.h → ...modules/slwrb4150a/include/board_module.h
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     boards_slwstk6000b
+ * @ingroup     boards_common_slwstk6000b
  * @{
  *
  * @file

diff --git a/...modules/slwrb4162a/include/board_module.h → ...modules/slwrb4162a/include/board_module.h b/...modules/slwrb4162a/include/board_module.h → ...modules/slwrb4162a/include/board_module.h
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     boards_slwstk6000b
+ * @ingroup     boards_common_slwstk6000b
  * @{
  *
  * @file

diff --git a/boards/slwstk6000b-slwrb4150a/Makefile b/boards/slwstk6000b-slwrb4150a/Makefile
@@ -0,0 +1,3 @@
+MODULE = board
+DIRS += $(RIOTBOARD)/common/slwstk6000b
+include $(RIOTBASE)/Makefile.base
diff --git a/boards/slwstk6000b-slwrb4150a/Makefile.dep b/boards/slwstk6000b-slwrb4150a/Makefile.dep
@@ -0,0 +1,2 @@
+USEMODULE += board_common_slwstk6000b
+include $(RIOTBOARD)/common/slwstk6000b/Makefile.dep
diff --git a/boards/slwstk6000b-slwrb4150a/Makefile.features b/boards/slwstk6000b-slwrb4150a/Makefile.features
@@ -0,0 +1 @@
+include $(RIOTBOARD)/common/slwstk6000b/Makefile.features
diff --git a/boards/slwstk6000b-slwrb4150a/Makefile.include b/boards/slwstk6000b-slwrb4150a/Makefile.include
@@ -0,0 +1,3 @@
+BOARD_MODULE = slwrb4150a
+
+include $(RIOTBOARD)/common/slwstk6000b/Makefile.include
diff --git a/boards/slwstk6000b-slwrb4162a/Makefile b/boards/slwstk6000b-slwrb4162a/Makefile
@@ -0,0 +1,3 @@
+MODULE = board
+DIRS += $(RIOTBOARD)/common/slwstk6000b
+include $(RIOTBASE)/Makefile.base
diff --git a/boards/slwstk6000b-slwrb4162a/Makefile.dep b/boards/slwstk6000b-slwrb4162a/Makefile.dep
@@ -0,0 +1,2 @@
+USEMODULE += board_common_slwstk6000b
+include $(RIOTBOARD)/common/slwstk6000b/Makefile.dep
diff --git a/boards/slwstk6000b-slwrb4162a/Makefile.features b/boards/slwstk6000b-slwrb4162a/Makefile.features
@@ -0,0 +1 @@
+include $(RIOTBOARD)/common/slwstk6000b/Makefile.features
diff --git a/boards/slwstk6000b-slwrb4162a/Makefile.include b/boards/slwstk6000b-slwrb4162a/Makefile.include
@@ -0,0 +1,3 @@
+BOARD_MODULE = slwrb4162a
+
+include $(RIOTBOARD)/common/slwstk6000b/Makefile.include
diff --git a/dist/tools/buildsystem_sanity_check/check.sh b/dist/tools/buildsystem_sanity_check/check.sh
@@ -156,7 +156,7 @@ check_cpu_cpu_model_defined_in_makefile_features() {
     pathspec+=(':!cpu/**/Makefile.features')
 
     # Currently blacklist this non migrated file for CPU_MODEL
-    pathspec+=(':!boards/slwstk6000b/Makefile.include')
+    pathspec+=(':!boards/common/slwstk6000b/Makefile.include')
 
     git -C "${RIOTBASE}" grep "${patterns[@]}" -- "${pathspec[@]}" \
             | error_with_message 'CPU and CPU_MODEL definition must be done by board/BOARD/Makefile.features, board/common/**/Makefile.features or cpu/CPU/Makefile.features'

diff --git a/examples/lua_REPL/Makefile b/examples/lua_REPL/Makefile
@@ -24,7 +24,8 @@ BOARD_INSUFFICIENT_MEMORY := blackpill blackpill-128kib bluepill \
                              remote-pa remote-reva remote-revb samd21-xpro \
                              saml10-xpro saml11-xpro saml21-xpro samr21-xpro \
                              samr30-xpro seeeduino_arch-pro sensebox_samd21 slstk3401a \
-                             sltb001a slwstk6220a sodaq-autonomo sodaq-explorer \
+                             sltb001a slwstk6000b-slwrb4150a slwstk6220a \
+                             sodaq-autonomo sodaq-explorer \
                              sodaq-one sodaq-sara-aff stk3600 stm32f3discovery \
                              stm32l0538-disco yunjia-nrf51822 \
                              esp8266-esp-12x esp8266-olimex-mod \

diff --git a/tests/cpu_efm32_features/Makefile b/tests/cpu_efm32_features/Makefile
@@ -5,7 +5,8 @@ BOARD_WHITELIST := ikea-tradfri \
                    slstk3401a \
                    slstk3402a \
                    sltb001a \
-                   slwstk6000b \
+                   slwstk6000b-slwrb4150a \
+                   slwstk6000b-slwrb4162a \
                    stk3600 \
                    stk3700
 

diff --git a/tests/driver_hd44780/Makefile b/tests/driver_hd44780/Makefile
@@ -2,7 +2,8 @@ include ../Makefile.tests_common
 
 # the stm32f4discovery does not have the arduino pinout
 BOARD_BLACKLIST := stm32f4discovery jiminy-mega256rfr2 slstk3401a slstk3402a \
-                   sltb001a slwstk6000b stk3600 stk3700
+                   sltb001a slwstk6000b-slwrb4150a slwstk6000b-slwrb4162a \
+                   stk3600 stk3700
 
 # currently the test provides config params for arduinos only
 FEATURES_REQUIRED += arduino

diff --git a/tests/driver_pca9685/Makefile b/tests/driver_pca9685/Makefile
@@ -1,7 +1,9 @@
 include ../Makefile.tests_common
 
 # These boards are blacklisted since efm32 CPU dosn't support PWM_RIGHT
-BOARD_BLACKLIST := slstk3401a slstk3402a sltb001a slwstk6000b stk3600 stk3700
+BOARD_BLACKLIST := slstk3401a slstk3402a sltb001a \
+                   slwstk6000b-slwrb4150a slwstk6000b-slwrb4162a \
+                   stk3600 stk3700
 
 # Boards with insufficient memory
 BOARD_INSUFFICIENT_MEMORY := arduino-duemilanove arduino-nano arduino-uno

diff --git a/tests/unittests/Makefile b/tests/unittests/Makefile
@@ -88,6 +88,7 @@ BOARD_INSUFFICIENT_MEMORY := airfy-beacon \
                              sensebox_samd21 \
                              slstk3401a \
                              sltb001a \
+                             slwstk6000b-slwrb4150a \
                              slwstk6220a \
                              sodaq-autonomo \
                              sodaq-explorer \
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ @@
      */
     /**
-     * @ingroup     boards_slwstk6000b
+     * @ingroup     boards_common_slwstk6000b
      * @{
      *
      * @file
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		USEMODULE += board_common_slwstk6000b
		include $(RIOTBOARD)/common/slwstk6000b/Makefile.dep
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		include $(RIOTBOARD)/common/slwstk6000b/Makefile.features
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		BOARD_MODULE = slwrb4150a

		include $(RIOTBOARD)/common/slwstk6000b/Makefile.include
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		BOARD_MODULE = slwrb4162a

		include $(RIOTBOARD)/common/slwstk6000b/Makefile.include