Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fjmolinas merged 1 commit into from
Oct 9, 2019
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion boards/common/slwstk6000b/Makefile.features
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
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)
FEATURES_PROVIDED += periph_adc
Expand Down
2 changes: 0 additions & 2 deletions boards/common/slwstk6000b/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ INCLUDES += -I$(RIOTBOARD)/common/slwstk6000b/include
# add module specific includes
INCLUDES += -I$(RIOTBOARD)/common/slwstk6000b/modules/$(BOARD_MODULE)/include

export CPU_MODEL = $(MODULE_CPU)

# set default port depending on operating system
PORT_LINUX ?= /dev/ttyACM0
PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
Expand Down
2 changes: 2 additions & 0 deletions boards/slwstk6000b-slwrb4150a/Makefile.features
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
# HACK this should be deduced from the daughter board in 'common/slwstk6000b'
CPU_MODEL = efr32mg1p233f256gm48
include $(RIOTBOARD)/common/slwstk6000b/Makefile.features
2 changes: 2 additions & 0 deletions boards/slwstk6000b-slwrb4162a/Makefile.features
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
# HACK this should be deduced from the daughter board in 'common/slwstk6000b'
CPU_MODEL = efr32mg12p332f1024gl125
include $(RIOTBOARD)/common/slwstk6000b/Makefile.features
3 changes: 0 additions & 3 deletions dist/tools/buildsystem_sanity_check/check.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,6 @@ check_cpu_cpu_model_defined_in_makefile_features() {
pathspec+=(':!boards/**/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[@]}" \
| 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'
}
Expand Down