From 950a206badfa61310c6cfb156fff6e93f713ee98 Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Tue, 18 Feb 2020 16:41:36 +0100 Subject: [PATCH] cpu/cortex-m: MPU: turn into feature "cortexm_mpu" --- Makefile.dep | 4 +++ cpu/cortexm_common/Makefile.features | 4 +++ tests/mpu_stack_guard/Makefile | 38 ---------------------------- 3 files changed, 8 insertions(+), 38 deletions(-) diff --git a/Makefile.dep b/Makefile.dep index 26843ad047..609414ccbe 100644 --- a/Makefile.dep +++ b/Makefile.dep @@ -26,6 +26,10 @@ ifneq (,$(filter ssp,$(USEMODULE))) FEATURES_REQUIRED += ssp endif +ifneq (,$(filter mpu_stack_guard,$(USEMODULE))) + FEATURES_REQUIRED += cortexm_mpu +endif + ifneq (,$(filter csma_sender,$(USEMODULE))) USEMODULE += random USEMODULE += xtimer diff --git a/cpu/cortexm_common/Makefile.features b/cpu/cortexm_common/Makefile.features index 74b9888ac1..cc8e19a158 100644 --- a/cpu/cortexm_common/Makefile.features +++ b/cpu/cortexm_common/Makefile.features @@ -5,3 +5,7 @@ FEATURES_PROVIDED += periph_pm FEATURES_PROVIDED += cpp FEATURES_PROVIDED += cpu_check_address FEATURES_PROVIDED += ssp + +ifneq ($(CPU_ARCH),cortex-m0) + FEATURES_PROVIDED += cortexm_mpu +endif diff --git a/tests/mpu_stack_guard/Makefile b/tests/mpu_stack_guard/Makefile index d45349e49e..64552cf758 100644 --- a/tests/mpu_stack_guard/Makefile +++ b/tests/mpu_stack_guard/Makefile @@ -1,44 +1,6 @@ BOARD ?= samr21-xpro include ../Makefile.tests_common -BOARD_WHITELIST += arduino-due # cortex-m3 -BOARD_WHITELIST += arduino-zero # cortex-m0plus -BOARD_WHITELIST += cc2538dk # cortex-m3 -BOARD_WHITELIST += cc2650stk # cortex-m3 -BOARD_WHITELIST += ek-lm4f120xl # cortex-m4f -BOARD_WHITELIST += f4vi1 # cortex-m4f -BOARD_WHITELIST += fox # cortex-m3 -BOARD_WHITELIST += frdm-k64f # cortex-m4 -BOARD_WHITELIST += ikea-tradfri # cortex-m4f -BOARD_WHITELIST += iotlab-a8-m3 # cortex-m3 -BOARD_WHITELIST += iotlab-m3 # cortex-m3 -BOARD_WHITELIST += limifrog-v1 # cortex-m3 -BOARD_WHITELIST += maple-mini # cortex-m3 -BOARD_WHITELIST += mbed_lpc1768 # cortex-m3 -BOARD_WHITELIST += msbiot # cortex-m4f -BOARD_WHITELIST += mulle # cortex-m4 -BOARD_WHITELIST += nrf52dk # cortex-m4f -BOARD_WHITELIST += nucleo-f103rb # cortex-m3 -BOARD_WHITELIST += nucleo-f207zg # cortex-m3 -BOARD_WHITELIST += nucleo-f303re # cortex-m4f -BOARD_WHITELIST += nucleo-f334r8 # cortex-m4f -BOARD_WHITELIST += nucleo-f401re # cortex-m4f -BOARD_WHITELIST += nucleo-f446re # cortex-m4f -BOARD_WHITELIST += nucleo-l152re # cortex-m3 -BOARD_WHITELIST += openmote-cc2538 # cortex-m3 -BOARD_WHITELIST += pba-d-01-kw2x # cortex-m4 -BOARD_WHITELIST += remote # cortex-m3 -BOARD_WHITELIST += samd21-xpro # cortex-m0plus -BOARD_WHITELIST += saml21-xpro # cortex-m0plus -BOARD_WHITELIST += samr21-xpro # cortex-m0plus -BOARD_WHITELIST += sltb001a # cortex-m4f -BOARD_WHITELIST += slwstk6220a # cortex-m4f -BOARD_WHITELIST += sodaq-autonomo # cortex-m0plus -BOARD_WHITELIST += spark-core # cortex-m3 -BOARD_WHITELIST += stm32f3discovery # cortex-m4f -BOARD_WHITELIST += stm32f4discovery # cortex-m4f -BOARD_WHITELIST += udoo # cortex-m3 - USEMODULE += mpu_stack_guard include $(RIOTBASE)/Makefile.include