From fd71e09b6901065603e53cc49d61f8ac8d42af05 Mon Sep 17 00:00:00 2001
From: Alexandre Abadie <alexandre.abadie@inria.fr>
Date: Fri, 21 Aug 2020 14:55:50 +0200
Subject: [PATCH 1/2] cpu/stm32: disable MPU for stm32g0

MPU is broken on cortex-m0+ in the current state
---
 cpu/stm32/Kconfig           | 1 -
 cpu/stm32/Makefile.features | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/cpu/stm32/Kconfig b/cpu/stm32/Kconfig
index d1c625f8cd..4a0c195206 100644
--- 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
 
diff --git a/cpu/stm32/Makefile.features b/cpu/stm32/Makefile.features
index 1450946018..22e9081923 100644
--- a/cpu/stm32/Makefile.features
+++ b/cpu/stm32/Makefile.features
@@ -32,7 +32,7 @@ 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
 

From b4aa2dae3e71e7e0128cd14a8cf715748d6fc0e1 Mon Sep 17 00:00:00 2001
From: Alexandre Abadie <alexandre.abadie@inria.fr>
Date: Fri, 21 Aug 2020 15:19:49 +0200
Subject: [PATCH 2/2] cpu/stm32: remove MPU feature from stm32l052t8

---
 cpu/stm32/Kconfig           | 1 -
 cpu/stm32/Makefile.features | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cpu/stm32/Kconfig b/cpu/stm32/Kconfig
index 4a0c195206..101d237c96 100644
--- a/cpu/stm32/Kconfig
+++ b/cpu/stm32/Kconfig
@@ -306,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
index 22e9081923..106c07a154 100644
--- a/cpu/stm32/Makefile.features
+++ b/cpu/stm32/Makefile.features
@@ -36,8 +36,9 @@ 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