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

boards/slwstk6000b-*: move CPU_MODEL definition to Makefile.features

Browse Source 
This is still currently a hack to hardcode it as the value can be deduced
from the `BOARD_MODULE` daughter board name.

But it requires more cleanup and could come in a separate step.

Part of moving CPU/CPU_MODEL definition to Makefile.features to have it
available before Makefile.include.
This commit is contained in:
Gaëtan Harter 2019-10-09 18:51:57 +02:00
parent 22b0873e2b
commit 7ac30e471c
No known key found for this signature in database
GPG Key ID: 76DF6BCF1B1F883B
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
CPU = efm32 CPU = efm32
# TODO move CPU_MODEL here # TODO move CPU_MODEL here based on the daughter board
# Put defined MCU peripherals here (in alphabetical order) # Put defined MCU peripherals here (in alphabetical order)
FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_adc

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

@ -4,8 +4,6 @@ INCLUDES += -I$(RIOTBOARD)/common/slwstk6000b/include
# add module specific includes # add module specific includes
INCLUDES += -I$(RIOTBOARD)/common/slwstk6000b/modules/$(BOARD_MODULE)/include INCLUDES += -I$(RIOTBOARD)/common/slwstk6000b/modules/$(BOARD_MODULE)/include
export CPU_MODEL = $(MODULE_CPU)
# set default port depending on operating system # set default port depending on operating system
PORT_LINUX ?= /dev/ttyACM0 PORT_LINUX ?= /dev/ttyACM0
PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))

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

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

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

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

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

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