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

Merge pull request #13180 from fjmolinas/pr_slwstk6000b_cleanup

Browse Source 
boards/slwstk6000b-*: cleanup
This commit is contained in:
Alexandre Abadie 2020-03-03 13:15:03 +01:00 committed by GitHub
commit 481f3bcb35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 31 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
boards/common/slwstk6000b/Makefile.features
View File

@ -1,5 +1,14 @@
CPU = efm32 CPU = efm32
# TODO move CPU_MODEL here based on the daughter board
# The radio board connected to the slwstk6000b mainboard
BOARD_MODULE = $(word 2, $(subst -, ,$(BOARD)))
include $(RIOTBOARD)/common/slwstk6000b/slwstk6000b.info.mk
CPU_MODEL = $(word 1, $(SLWSTK6000B_MAINBOARD_VARS_$(BOARD_MODULE)))
ifeq (,$(CPU_MODEL))
$(error $(BOARD_MODULE) can not be used with slwstk600b mainboard)
endif
# Put defined MCU peripherals here (in alphabetical order) # Put defined MCU peripherals here (in alphabetical order)
FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_adc

7
boards/common/slwstk6000b/Makefile.include
View File

@ -1,7 +1,5 @@
include $(RIOTBOARD)/common/slwstk6000b/module-info.mk
INCLUDES += -I$(RIOTBOARD)/common/slwstk6000b/include INCLUDES += -I$(RIOTBOARD)/common/slwstk6000b/include
# add module specific includes # add BOARD_MODULE specific includes
INCLUDES += -I$(RIOTBOARD)/common/slwstk6000b/modules/$(BOARD_MODULE)/include INCLUDES += -I$(RIOTBOARD)/common/slwstk6000b/modules/$(BOARD_MODULE)/include
# set default port depending on operating system # set default port depending on operating system
@ -12,7 +10,8 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
include $(RIOTMAKE)/tools/serial.inc.mk include $(RIOTMAKE)/tools/serial.inc.mk
# setup JLink for flashing # setup JLink for flashing
export JLINK_DEVICE := $(MODULE_JLINK_DEVICE) include $(RIOTBOARD)/common/slwstk6000b/slwstk6000b.info.mk
export JLINK_DEVICE = $(word 2, $(SLWSTK6000B_MAINBOARD_VARS_$(BOARD_MODULE)))
# include board common # include board common
include $(RIOTBOARD)/common/silabs/Makefile.include include $(RIOTBOARD)/common/silabs/Makefile.include

21
boards/common/slwstk6000b/module-info.mk
View File

@ -1,21 +0,0 @@
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)/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)/common/slwstk6000b/modules.txt)
ifeq (,$(MODULE_INFO))
$(error Unable to read module information for $(BOARD_MODULE))
endif
# Export variables to use in this build.
export MODULE_CPU = $(word 2, $(MODULE_INFO))
export MODULE_JLINK_DEVICE = $(word 3, $(MODULE_INFO))

24
boards/common/slwstk6000b/modules.txt
View File

@ -1,24 +0,0 @@
# This file contains the supported modules by the SLWSTK6000B wireless starter
# kit. See Silicon Labs website for more information.
# The intended usage is to grep for the exact module name, and split by spaces
# to get the required information.
# Module - CPU - JLink Device
slwrb4150a efr32mg1p233f256gm48 efr32mg1pxxxf256
slwrb4150b efr32mg1p233f256gm48 efr32mg1pxxxf256
slwrb4151a efr32mg1p232f256gm48 efr32mg1pxxxf256
slwrb4152a efr32mg1p232f256gm48 efr32mg1pxxxf256
slwrb4153a efr32mg1p132f256gm48 efr32mg1pxxxf256
slwrb4154a efr32mg1p732f256gm32 efr32mg1pxxxf256
slwrb4158a efr32mg13p733f512gm48 efr32mg13p733f512gm48
slwrb4159a efr32mg13p632f512gm48 efr32mg13p632f512gm48
slwrb4161a efr32mg12p432f1024gl125 efr32mg12p432f1024gl125
slwrb4162a efr32mg12p332f1024gl125 efr32mg12p332f1024gl125
slwrb4163a efr32mg12p433f1024gl125 efr32mg12p433f1024gl125
slwrb4164a efr32mg12p433f1024gl125 efr32mg12p433f1024gl125
slwrb4167a efr32mg13p733f512gm48 efr32mg13p733f512gm48
slwrb4168a efr32mg13p732f512gm48 efr32mg13p732f512gm48
slwrb4169a efr32mg14p733f256gm48 efr32mg14p733f256gm48
slwrb4169b efr32mg14p733f256gm48 efr32mg14p733f256gm48
slwrb4170a efr32mg12p433f1024gm68 efr32mg12p433f1024gm68

18
boards/common/slwstk6000b/slwstk6000b.info.mk Normal file
View File

@ -0,0 +1,18 @@
# CPU_MODEL - JLINK_DEVICE
SLWSTK6000B_MAINBOARD_VARS_slwrb4150a = efr32mg1p233f256gm48 efr32mg1pxxxf256
SLWSTK6000B_MAINBOARD_VARS_slwrb4150b = efr32mg1p233f256gm48 efr32mg1pxxxf256
SLWSTK6000B_MAINBOARD_VARS_slwrb4151a = efr32mg1p232f256gm48 efr32mg1pxxxf256
SLWSTK6000B_MAINBOARD_VARS_slwrb4152a = efr32mg1p232f256gm48 efr32mg1pxxxf256
SLWSTK6000B_MAINBOARD_VARS_slwrb4153a = efr32mg1p132f256gm48 efr32mg1pxxxf256
SLWSTK6000B_MAINBOARD_VARS_slwrb4154a = efr32mg1p732f256gm32 efr32mg1pxxxf256
SLWSTK6000B_MAINBOARD_VARS_slwrb4158a = efr32mg13p733f512gm48 efr32mg13p733f512gm48
SLWSTK6000B_MAINBOARD_VARS_slwrb4159a = efr32mg13p632f512gm48 efr32mg13p632f512gm48
SLWSTK6000B_MAINBOARD_VARS_slwrb4161a = efr32mg12p432f1024gl125 efr32mg12p432f1024gl125
SLWSTK6000B_MAINBOARD_VARS_slwrb4162a = efr32mg12p332f1024gl125 efr32mg12p332f1024gl125
SLWSTK6000B_MAINBOARD_VARS_slwrb4163a = efr32mg12p433f1024gl125 efr32mg12p433f1024gl125
SLWSTK6000B_MAINBOARD_VARS_slwrb4164a = efr32mg12p433f1024gl125 efr32mg12p433f1024gl125
SLWSTK6000B_MAINBOARD_VARS_slwrb4167a = efr32mg13p733f512gm48 efr32mg13p733f512gm48
SLWSTK6000B_MAINBOARD_VARS_slwrb4168a = efr32mg13p732f512gm48 efr32mg13p732f512gm48
SLWSTK6000B_MAINBOARD_VARS_slwrb4169a = efr32mg14p733f256gm48 efr32mg14p733f256gm48
SLWSTK6000B_MAINBOARD_VARS_slwrb4169b = efr32mg14p733f256gm48 efr32mg14p733f256gm48
SLWSTK6000B_MAINBOARD_VARS_slwrb4170a = efr32mg12p433f1024gm68 efr32mg12p433f1024gm68

2
boards/slwstk6000b-slwrb4150a/Makefile.features
View File

@ -1,4 +1,2 @@
# HACK this should be deduced from the daughter board in 'common/slwstk6000b'
CPU_FAM = efr32mg1p CPU_FAM = efr32mg1p
CPU_MODEL = efr32mg1p233f256gm48
include $(RIOTBOARD)/common/slwstk6000b/Makefile.features include $(RIOTBOARD)/common/slwstk6000b/Makefile.features

2
boards/slwstk6000b-slwrb4150a/Makefile.include
View File

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

2
boards/slwstk6000b-slwrb4162a/Makefile.features
View File

@ -1,4 +1,2 @@
# HACK this should be deduced from the daughter board in 'common/slwstk6000b'
CPU_FAM = efr32mg12p CPU_FAM = efr32mg12p
CPU_MODEL = efr32mg12p332f1024gl125
include $(RIOTBOARD)/common/slwstk6000b/Makefile.features include $(RIOTBOARD)/common/slwstk6000b/Makefile.features

2
boards/slwstk6000b-slwrb4162a/Makefile.include
View File

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