riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
boards/slwstk6000b-*: split one board for each module
This commit is contained in:
Francisco 2019-10-08 17:41:15 +02:00 committed by GitHub
commit 94e00328c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 44 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boards/slwstk6000b/Makefile → boards/common/slwstk6000b/Makefile
View File

@ -1,4 +1,4 @@
MODULE = board MODULE = board_common_slwstk6000b
DIRS = $(RIOTBOARD)/common/silabs DIRS = $(RIOTBOARD)/common/silabs

0
boards/slwstk6000b/Makefile.dep → boards/common/slwstk6000b/Makefile.dep
View File

0
boards/slwstk6000b/Makefile.features → boards/common/slwstk6000b/Makefile.features
View File

5
boards/slwstk6000b/Makefile.include → boards/common/slwstk6000b/Makefile.include
View File

@ -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 # 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) export CPU_MODEL = $(MODULE_CPU)

2
boards/slwstk6000b/board.c → boards/common/slwstk6000b/board.c
View File

@ -7,7 +7,7 @@
*/ */
/** /**
* @ingroup boards_slwstk6000b * @ingroup boards_common_slwstk6000b
* @{ * @{
* *
* @file * @file

2
boards/slwstk6000b/include/board.h → boards/common/slwstk6000b/include/board.h
View File

@ -7,7 +7,7 @@
*/ */
/** /**
* @defgroup boards_slwstk6000b Silicon Labs SLWSTK6000B starter kit * @defgroup boards_common_slwstk6000b Silicon Labs SLWSTK6000B starter kit
* @ingroup boards * @ingroup boards
* @brief Support for the Silicon Labs SLWSTK6000B starter kit * @brief Support for the Silicon Labs SLWSTK6000B starter kit
* @{ * @{

2
boards/slwstk6000b/include/gpio_params.h → boards/common/slwstk6000b/include/gpio_params.h
View File

@ -7,7 +7,7 @@
*/ */
/** /**
* @ingroup boards_slwstk6000b * @ingroup boards_common_slwstk6000b
* @{ * @{
* *
* @file * @file

2
boards/slwstk6000b/include/periph_conf.h → boards/common/slwstk6000b/include/periph_conf.h
View File

@ -7,7 +7,7 @@
*/ */
/** /**
* @ingroup boards_slwstk6000b * @ingroup boards_common_slwstk6000b
* @{ * @{
* *
* @file * @file

9
boards/slwstk6000b/module-info.mk → boards/common/slwstk6000b/module-info.mk
View File

@ -1,15 +1,16 @@
# Define the default board module. ifeq (,$(BOARD_MODULE))
BOARD_MODULE ?= slwrb4162a $(error Board module must be defined in $(BOARD_MODULE))
endif
# Find the header file that should exist if the module is supported. # 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)) ifeq (,$(MODULE_HEADER))
$(error Header file for $(BOARD_MODULE) is missing) $(error Header file for $(BOARD_MODULE) is missing)
endif endif
# Lookup up CPU information using grep. # 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)) ifeq (,$(MODULE_INFO))
$(error Unable to read module information for $(BOARD_MODULE)) $(error Unable to read module information for $(BOARD_MODULE))

0
boards/slwstk6000b/modules.txt → boards/common/slwstk6000b/modules.txt
View File

2
boards/slwstk6000b/modules/slwrb4150a/include/board_module.h → boards/common/slwstk6000b/modules/slwrb4150a/include/board_module.h
View File

@ -7,7 +7,7 @@
*/ */
/** /**
* @ingroup boards_slwstk6000b * @ingroup boards_common_slwstk6000b
* @{ * @{
* *
* @file * @file

2
boards/slwstk6000b/modules/slwrb4162a/include/board_module.h → boards/common/slwstk6000b/modules/slwrb4162a/include/board_module.h
View File

@ -7,7 +7,7 @@
*/ */
/** /**
* @ingroup boards_slwstk6000b * @ingroup boards_common_slwstk6000b
* @{ * @{
* *
* @file * @file

3
boards/slwstk6000b-slwrb4150a/Makefile Normal file
View File

@ -0,0 +1,3 @@
MODULE = board
DIRS += $(RIOTBOARD)/common/slwstk6000b
include $(RIOTBASE)/Makefile.base

2
boards/slwstk6000b-slwrb4150a/Makefile.dep Normal file
View File

@ -0,0 +1,2 @@
USEMODULE += board_common_slwstk6000b
include $(RIOTBOARD)/common/slwstk6000b/Makefile.dep

1
boards/slwstk6000b-slwrb4150a/Makefile.features Normal file
View File

@ -0,0 +1 @@
include $(RIOTBOARD)/common/slwstk6000b/Makefile.features

3
boards/slwstk6000b-slwrb4150a/Makefile.include Normal file
View File

@ -0,0 +1,3 @@
BOARD_MODULE = slwrb4150a
include $(RIOTBOARD)/common/slwstk6000b/Makefile.include

3
boards/slwstk6000b-slwrb4162a/Makefile Normal file
View File

@ -0,0 +1,3 @@
MODULE = board
DIRS += $(RIOTBOARD)/common/slwstk6000b
include $(RIOTBASE)/Makefile.base

2
boards/slwstk6000b-slwrb4162a/Makefile.dep Normal file
View File

@ -0,0 +1,2 @@
USEMODULE += board_common_slwstk6000b
include $(RIOTBOARD)/common/slwstk6000b/Makefile.dep

1
boards/slwstk6000b-slwrb4162a/Makefile.features Normal file
View File

@ -0,0 +1 @@
include $(RIOTBOARD)/common/slwstk6000b/Makefile.features

3
boards/slwstk6000b-slwrb4162a/Makefile.include Normal file
View File

@ -0,0 +1,3 @@
BOARD_MODULE = slwrb4162a
include $(RIOTBOARD)/common/slwstk6000b/Makefile.include

2
dist/tools/buildsystem_sanity_check/check.sh vendored
View File

@ -156,7 +156,7 @@ check_cpu_cpu_model_defined_in_makefile_features() {
pathspec+=(':!cpu/**/Makefile.features') pathspec+=(':!cpu/**/Makefile.features')
# Currently blacklist this non migrated file for CPU_MODEL # 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[@]}" \ 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' | 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'

3
examples/lua_REPL/Makefile
View File

@ -24,7 +24,8 @@ BOARD_INSUFFICIENT_MEMORY := blackpill blackpill-128kib bluepill \
remote-pa remote-reva remote-revb samd21-xpro \ remote-pa remote-reva remote-revb samd21-xpro \
saml10-xpro saml11-xpro saml21-xpro samr21-xpro \ saml10-xpro saml11-xpro saml21-xpro samr21-xpro \
samr30-xpro seeeduino_arch-pro sensebox_samd21 slstk3401a \ 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 \ sodaq-one sodaq-sara-aff stk3600 stm32f3discovery \
stm32l0538-disco yunjia-nrf51822 \ stm32l0538-disco yunjia-nrf51822 \
esp8266-esp-12x esp8266-olimex-mod \ esp8266-esp-12x esp8266-olimex-mod \

3
tests/cpu_efm32_features/Makefile
View File

@ -5,7 +5,8 @@ BOARD_WHITELIST := ikea-tradfri \
slstk3401a \ slstk3401a \
slstk3402a \ slstk3402a \
sltb001a \ sltb001a \
slwstk6000b \ slwstk6000b-slwrb4150a \
slwstk6000b-slwrb4162a \
stk3600 \ stk3600 \
stk3700 stk3700

3
tests/driver_hd44780/Makefile
View File

@ -2,7 +2,8 @@ include ../Makefile.tests_common
# the stm32f4discovery does not have the arduino pinout # the stm32f4discovery does not have the arduino pinout
BOARD_BLACKLIST := stm32f4discovery jiminy-mega256rfr2 slstk3401a slstk3402a \ 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 # currently the test provides config params for arduinos only
FEATURES_REQUIRED += arduino FEATURES_REQUIRED += arduino

4
tests/driver_pca9685/Makefile
View File

@ -1,7 +1,9 @@
include ../Makefile.tests_common include ../Makefile.tests_common
# These boards are blacklisted since efm32 CPU dosn't support PWM_RIGHT # 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 # Boards with insufficient memory
BOARD_INSUFFICIENT_MEMORY := arduino-duemilanove arduino-nano arduino-uno BOARD_INSUFFICIENT_MEMORY := arduino-duemilanove arduino-nano arduino-uno

1
tests/unittests/Makefile
View File

@ -88,6 +88,7 @@ BOARD_INSUFFICIENT_MEMORY := airfy-beacon \
sensebox_samd21 \ sensebox_samd21 \
slstk3401a \ slstk3401a \
sltb001a \ sltb001a \
slwstk6000b-slwrb4150a \
slwstk6220a \ slwstk6220a \
sodaq-autonomo \ sodaq-autonomo \
sodaq-explorer \ sodaq-explorer \