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

cpu/cortexm_common: Rename arch_cortexm feature to cpu_core_cortexm

Browse Source
This commit is contained in:
Leandro Lanzieri 2020-06-10 13:30:56 +02:00
parent 4d65bc8e0a
commit 649017f0b2
No known key found for this signature in database
GPG Key ID: 13559905E2EBEAA5
6 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.dep
View File

@ -1071,6 +1071,9 @@ FEATURES_OPTIONAL += periph_pm
# always select provided architecture features # always select provided architecture features
FEATURES_REQUIRED += $(filter arch_%,$(FEATURES_PROVIDED)) FEATURES_REQUIRED += $(filter arch_%,$(FEATURES_PROVIDED))
# always select CPU core features
FEATURES_REQUIRED += $(filter cpu_core_%,$(FEATURES_PROVIDED))
ifneq (,$(filter ecc_%,$(USEMODULE))) ifneq (,$(filter ecc_%,$(USEMODULE)))
USEMODULE += ecc USEMODULE += ecc
endif endif

6
cpu/cortexm_common/Kconfig
View File

@ -26,7 +26,7 @@ config CPU_ARCH
config CPU_CORE_CORTEX_M config CPU_CORE_CORTEX_M
bool bool
select HAS_ARCH_CORTEXM select HAS_CPU_CORE_CORTEXM
select HAS_PERIPH_PM select HAS_PERIPH_PM
select HAS_CPP select HAS_CPP
select HAS_CPU_CHECK_ADDRESS select HAS_CPU_CHECK_ADDRESS
@ -81,10 +81,10 @@ config CPU_CORE_CORTEX_M7
select HAS_CORTEXM_FPU select HAS_CORTEXM_FPU
## Definition of specific features ## Definition of specific features
config HAS_ARCH_CORTEXM config HAS_CPU_CORE_CORTEXM
bool bool
help help
Indicates that the current architecture is ARM Cortex-M. Indicates that the current CPU has an ARM Cortex-M core.
config HAS_ARCH_ARM config HAS_ARCH_ARM
bool bool

2
cpu/cortexm_common/Makefile.features
View File

@ -1,6 +1,6 @@
FEATURES_PROVIDED += arch_32bit FEATURES_PROVIDED += arch_32bit
FEATURES_PROVIDED += arch_arm FEATURES_PROVIDED += arch_arm
FEATURES_PROVIDED += arch_cortexm FEATURES_PROVIDED += cpu_core_cortexm
FEATURES_PROVIDED += periph_pm FEATURES_PROVIDED += periph_pm
FEATURES_PROVIDED += cortexm_svc FEATURES_PROVIDED += cortexm_svc
FEATURES_PROVIDED += cpp FEATURES_PROVIDED += cpp

2
makefiles/stdio.inc.mk
View File

@ -53,5 +53,5 @@ endif
ifneq (,$(filter stdio_semihosting,$(USEMODULE))) ifneq (,$(filter stdio_semihosting,$(USEMODULE)))
USEMODULE += xtimer USEMODULE += xtimer
FEATURES_REQUIRED += arch_cortexm FEATURES_REQUIRED += cpu_core_cortexm
endif endif

2
pkg/cmsis-nn/Makefile.dep
View File

@ -1 +1 @@
FEATURES_REQUIRED += arch_cortexm FEATURES_REQUIRED += cpu_core_cortexm

4
tests/pkg_cmsis-nn/Makefile
View File

@ -7,8 +7,8 @@ BLOBS += input
# Boards that were tested and are known to work # Boards that were tested and are known to work
# This package only works with Cortex M3, M4 and M7 CPUs but there's no easy # This package only works with Cortex M3, M4 and M7 CPUs but there's no easy
# way provided by the build system to filter them at that level (arch_cortexm is # way provided by the build system to filter them at that level
# the only feature available) for the moment. # (cpu_core_cortexm is the only feature available) for the moment.
BOARD_WHITELIST := \ BOARD_WHITELIST := \
b-l475e-iot01a \ b-l475e-iot01a \
iotlab-m3 \ iotlab-m3 \