From ca4930fd7b95a0ba030fe1f59952f2258fb3284b Mon Sep 17 00:00:00 2001 From: Bas Stottelaar Date: Wed, 6 Jan 2021 22:31:46 +0100 Subject: [PATCH 1/4] boards/e180-zg120b-tb: remove silabs_common --- boards/e180-zg120b-tb/Kconfig | 1 - boards/e180-zg120b-tb/Makefile | 2 -- boards/e180-zg120b-tb/Makefile.dep | 6 ------ boards/e180-zg120b-tb/Makefile.features | 2 -- boards/e180-zg120b-tb/board.c | 1 - 5 files changed, 12 deletions(-) diff --git a/boards/e180-zg120b-tb/Kconfig b/boards/e180-zg120b-tb/Kconfig index 86b8669e32..7407fb8756 100644 --- a/boards/e180-zg120b-tb/Kconfig +++ b/boards/e180-zg120b-tb/Kconfig @@ -10,7 +10,6 @@ config BOARD config BOARD_E180_ZG120B_TB bool default y - select BOARD_COMMON_SILABS select CPU_MODEL_EFR32MG1B232F256GM32 select HAS_PERIPH_ADC select HAS_PERIPH_RTC diff --git a/boards/e180-zg120b-tb/Makefile b/boards/e180-zg120b-tb/Makefile index 39108f4589..f8fcbb53a0 100644 --- a/boards/e180-zg120b-tb/Makefile +++ b/boards/e180-zg120b-tb/Makefile @@ -1,5 +1,3 @@ MODULE = board -DIRS = $(RIOTBOARD)/common/silabs - include $(RIOTBASE)/Makefile.base diff --git a/boards/e180-zg120b-tb/Makefile.dep b/boards/e180-zg120b-tb/Makefile.dep index d8e51b9cc3..784c02eab7 100644 --- a/boards/e180-zg120b-tb/Makefile.dep +++ b/boards/e180-zg120b-tb/Makefile.dep @@ -2,9 +2,3 @@ ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += efm32_coretemp USEMODULE += saul_gpio endif - -# add board common drivers -USEMODULE += boards_common_silabs - -# include board common dependencies -include $(RIOTBOARD)/common/silabs/Makefile.dep diff --git a/boards/e180-zg120b-tb/Makefile.features b/boards/e180-zg120b-tb/Makefile.features index f507153bcc..5981b04f94 100644 --- a/boards/e180-zg120b-tb/Makefile.features +++ b/boards/e180-zg120b-tb/Makefile.features @@ -12,5 +12,3 @@ FEATURES_PROVIDED += periph_uart periph_uart_modecfg # Put other features for this board (in alphabetical order) FEATURES_PROVIDED += riotboot FEATURES_PROVIDED += efm32_coretemp - -include $(RIOTBOARD)/common/silabs/Makefile.features diff --git a/boards/e180-zg120b-tb/board.c b/boards/e180-zg120b-tb/board.c index fea34ada4d..b4cfad7dea 100644 --- a/boards/e180-zg120b-tb/board.c +++ b/boards/e180-zg120b-tb/board.c @@ -20,7 +20,6 @@ */ #include "board.h" -#include "board_common.h" void board_init(void) { From b6062e4f92205d5de4cd302619768b08d3e9a567 Mon Sep 17 00:00:00 2001 From: Bas Stottelaar Date: Wed, 6 Jan 2021 22:20:57 +0100 Subject: [PATCH 2/4] boards/e180-zg120b-tb: simplify flashing --- boards/e180-zg120b-tb/Makefile.include | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/boards/e180-zg120b-tb/Makefile.include b/boards/e180-zg120b-tb/Makefile.include index 307862f183..0621315977 100644 --- a/boards/e180-zg120b-tb/Makefile.include +++ b/boards/e180-zg120b-tb/Makefile.include @@ -1,10 +1,4 @@ -# set default port depending on operating system -PORT_LINUX ?= /dev/ttyUSB0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) - # setup JLink for flashing +PROGRAMMER ?= jlink JLINK_DEVICE = EFR32MG1BxxxF256 JLINK_PRE_FLASH = r - -# include board common -include $(RIOTBOARD)/common/silabs/Makefile.include From 0a9a9013486150d2e29322652729ca46f9b1f9a9 Mon Sep 17 00:00:00 2001 From: Bas Stottelaar Date: Wed, 6 Jan 2021 22:21:25 +0100 Subject: [PATCH 3/4] boards/e180-zg120b-tb: order alphabetically --- boards/e180-zg120b-tb/Makefile.features | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boards/e180-zg120b-tb/Makefile.features b/boards/e180-zg120b-tb/Makefile.features index 5981b04f94..5f5e80a693 100644 --- a/boards/e180-zg120b-tb/Makefile.features +++ b/boards/e180-zg120b-tb/Makefile.features @@ -10,5 +10,5 @@ FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart periph_uart_modecfg # Put other features for this board (in alphabetical order) -FEATURES_PROVIDED += riotboot FEATURES_PROVIDED += efm32_coretemp +FEATURES_PROVIDED += riotboot From 04a0db1c86ca2c4fdb4c58e7e6f7bb7c5e6e02fd Mon Sep 17 00:00:00 2001 From: Bas Stottelaar Date: Wed, 6 Jan 2021 22:21:36 +0100 Subject: [PATCH 4/4] ikea-tradfri: order alphabetically --- boards/ikea-tradfri/Makefile.features | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boards/ikea-tradfri/Makefile.features b/boards/ikea-tradfri/Makefile.features index 2eb3d3a320..1079c42952 100644 --- a/boards/ikea-tradfri/Makefile.features +++ b/boards/ikea-tradfri/Makefile.features @@ -11,5 +11,5 @@ FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart periph_uart_modecfg # Put other features for this board (in alphabetical order) -FEATURES_PROVIDED += riotboot FEATURES_PROVIDED += efm32_coretemp +FEATURES_PROVIDED += riotboot