Merge pull request #14823 from aabadie/pr/cpu/stm32g0_disable_mpu

cpu/stm32: disable MPU for cortex-m0+ (stm32g0 and stm32l052t8)
RIOT-OS · Aug 21, 2020 · bb62b24 · bb62b24
2 parents fb63453 + b4aa2da
commit bb62b24
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/cpu/stm32/Kconfig b/cpu/stm32/Kconfig
@@ -70,7 +70,6 @@ config CPU_FAM_G0
     select CPU_STM32
     select CPU_CORE_CORTEX_M0PLUS
     select HAS_CPU_STM32G0
-    select HAS_CORTEXM_MPU
     select HAS_PERIPH_FLASHPAGE
     select HAS_PERIPH_FLASHPAGE_RAW
 
@@ -307,7 +306,6 @@ config CPU_MODEL_STM32L031K6
 config CPU_MODEL_STM32L052T8
     bool
     select CPU_FAM_L0
-    select HAS_CORTEXM_MPU
     select HAS_PERIPH_HWRNG
 
 config CPU_MODEL_STM32L053R8

diff --git a/cpu/stm32/Makefile.features b/cpu/stm32/Makefile.features
@@ -32,12 +32,13 @@ ifneq (,$(filter $(CPU_FAM),f2 f4 f7 g4 l0 l4 wb))
   endif
 endif
 
-ifneq (,$(filter $(CPU_FAM),f2 f4 f7 g0 g4 l1 l4))
+ifneq (,$(filter $(CPU_FAM),f2 f4 f7 g4 l1 l4))
   FEATURES_PROVIDED += cortexm_mpu
 endif
 
-# only some stm32f3 and stm32l0 have an MPU
-STM32_WITH_MPU += stm32f303re stm32f303vc stm32f303ze stm32l052t8
+# only some stm32f3 have an MPU, stm32l052t8 provides an MPU but support is
+# broken for cortex-m0+
+STM32_WITH_MPU += stm32f303re stm32f303vc stm32f303ze
 ifneq (,$(filter $(CPU_MODEL),$(STM32_WITH_MPU)))
   FEATURES_PROVIDED += cortexm_mpu
 endif