From 1ab5a9390d508e55ca0272a414ea043375eacd3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= Date: Mon, 30 Sep 2019 19:12:55 +0200 Subject: [PATCH] boards/slwstk6000b-*: split one board for each module Define one board for each of the available modules. --- boards/{slwstk6000b => slwstk6000b-slwrb4150a}/Makefile | 0 boards/{slwstk6000b => slwstk6000b-slwrb4150a}/Makefile.dep | 0 .../{slwstk6000b => slwstk6000b-slwrb4150a}/Makefile.features | 0 boards/slwstk6000b-slwrb4150a/Makefile.include | 3 +++ boards/slwstk6000b-slwrb4162a/Makefile | 3 +++ boards/slwstk6000b-slwrb4162a/Makefile.dep | 2 ++ boards/slwstk6000b-slwrb4162a/Makefile.features | 1 + boards/slwstk6000b-slwrb4162a/Makefile.include | 3 +++ boards/slwstk6000b/Makefile.include | 4 ---- examples/lua_REPL/Makefile | 3 ++- tests/cpu_efm32_features/Makefile | 3 ++- tests/driver_hd44780/Makefile | 3 ++- tests/driver_pca9685/Makefile | 4 +++- tests/unittests/Makefile | 1 + 14 files changed, 22 insertions(+), 8 deletions(-) rename boards/{slwstk6000b => slwstk6000b-slwrb4150a}/Makefile (100%) rename boards/{slwstk6000b => slwstk6000b-slwrb4150a}/Makefile.dep (100%) rename boards/{slwstk6000b => slwstk6000b-slwrb4150a}/Makefile.features (100%) create mode 100644 boards/slwstk6000b-slwrb4150a/Makefile.include create mode 100644 boards/slwstk6000b-slwrb4162a/Makefile create mode 100644 boards/slwstk6000b-slwrb4162a/Makefile.dep create mode 100644 boards/slwstk6000b-slwrb4162a/Makefile.features create mode 100644 boards/slwstk6000b-slwrb4162a/Makefile.include delete mode 100644 boards/slwstk6000b/Makefile.include diff --git a/boards/slwstk6000b/Makefile b/boards/slwstk6000b-slwrb4150a/Makefile similarity index 100% rename from boards/slwstk6000b/Makefile rename to boards/slwstk6000b-slwrb4150a/Makefile diff --git a/boards/slwstk6000b/Makefile.dep b/boards/slwstk6000b-slwrb4150a/Makefile.dep similarity index 100% rename from boards/slwstk6000b/Makefile.dep rename to boards/slwstk6000b-slwrb4150a/Makefile.dep diff --git a/boards/slwstk6000b/Makefile.features b/boards/slwstk6000b-slwrb4150a/Makefile.features similarity index 100% rename from boards/slwstk6000b/Makefile.features rename to boards/slwstk6000b-slwrb4150a/Makefile.features diff --git a/boards/slwstk6000b-slwrb4150a/Makefile.include b/boards/slwstk6000b-slwrb4150a/Makefile.include new file mode 100644 index 0000000000..fc9870821d --- /dev/null +++ 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 new file mode 100644 index 0000000000..ee68fe10c7 --- /dev/null +++ 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 new file mode 100644 index 0000000000..4554f0de45 --- /dev/null +++ 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 new file mode 100644 index 0000000000..a9759a3c88 --- /dev/null +++ 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 new file mode 100644 index 0000000000..a5d9d7c157 --- /dev/null +++ b/boards/slwstk6000b-slwrb4162a/Makefile.include @@ -0,0 +1,3 @@ +BOARD_MODULE = slwrb4162a + +include $(RIOTBOARD)/common/slwstk6000b/Makefile.include diff --git a/boards/slwstk6000b/Makefile.include b/boards/slwstk6000b/Makefile.include deleted file mode 100644 index 8b80531940..0000000000 --- a/boards/slwstk6000b/Makefile.include +++ /dev/null @@ -1,4 +0,0 @@ -# Define the default board module. -BOARD_MODULE ?= slwrb4162a - -include $(RIOTBOARD)/common/slwstk6000b/Makefile.include diff --git a/examples/lua_REPL/Makefile b/examples/lua_REPL/Makefile index 8c79ab8242..84daf23e7b 100644 --- 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 index 224d17e7fd..c67ba9c16a 100644 --- 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 index b27f45e086..6aee6a5424 100644 --- 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 index e8be7ac441..f5177e41e3 100644 --- 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 index 3218535aba..819fa546ae 100644 --- 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 \