commit 008f4a7a307ec17dc97bdc808b90e83d15b9b027
author Henrik Brix Andersen <hebad@vestas.com> Tue Dec 08 14:40:19 2020 +0100
committer Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no> Fri Dec 18 18:31:38 2020 +0100
tree 35bdc26b470b57927d7baada81ef0acc61275bac
parent 7cca88ab8ebe7f16dd1c0175bf9a0c289e471690

boot: zephyr: cleanup NXP MPU configuration before boot

Cleanup the NXP MPU configuration before chain-loading the
application.

Signed-off-by: Henrik Brix Andersen <hebad@vestas.com>

boot/zephyr/arm_cleanup.c

diff --git a/boot/zephyr/arm_cleanup.c b/boot/zephyr/arm_cleanup.c
index ff4b42e..c6f738b 100644
--- a/boot/zephyr/arm_cleanup.c
+++ b/boot/zephyr/arm_cleanup.c
@@ -5,6 +5,11 @@
  */
 
 #include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <toolchain.h>
+
+#if CONFIG_CPU_HAS_NXP_MPU
+#include <fsl_sysmpu.h>
+#endif
 
 void cleanup_arm_nvic(void) {
 	/* Allow any pending interrupts to be recognized */
@@ -33,4 +38,18 @@
 		ARM_MPU_ClrRegion(i);
 	}
 }
+#elif CONFIG_CPU_HAS_NXP_MPU
+__weak void z_arm_clear_arm_mpu_config(void)
+{
+	int i;
+
+	int num_regions = FSL_FEATURE_SYSMPU_DESCRIPTOR_COUNT;
+
+	SYSMPU_Enable(SYSMPU, false);
+
+	/* NXP MPU region 0 is reserved for the debugger */
+	for (i = 1; i < num_regions; i++) {
+		SYSMPU_RegionEnable(SYSMPU, i, false);
+	}
+}
 #endif

boot/zephyr/include/arm_cleanup.h

diff --git a/boot/zephyr/include/arm_cleanup.h b/boot/zephyr/include/arm_cleanup.h
index 9f9112c..565477c 100644
--- a/boot/zephyr/include/arm_cleanup.h
+++ b/boot/zephyr/include/arm_cleanup.h
@@ -13,7 +13,7 @@
  */
 void cleanup_arm_nvic(void);
 
-#if defined(CONFIG_CPU_HAS_ARM_MPU)
+#if defined(CONFIG_CPU_HAS_ARM_MPU) || defined(CONFIG_CPU_HAS_NXP_MPU)
 /**
  * Cleanup all ARM MPU region configuration
  */

boot/zephyr/main.c

diff --git a/boot/zephyr/main.c b/boot/zephyr/main.c
index 36c022a..19c9995 100644
--- a/boot/zephyr/main.c
+++ b/boot/zephyr/main.c
@@ -148,7 +148,7 @@
     SCB_DisableICache();
 #endif
 
-#if CONFIG_CPU_HAS_ARM_MPU
+#if CONFIG_CPU_HAS_ARM_MPU || CONFIG_CPU_HAS_NXP_MPU
     z_arm_clear_arm_mpu_config();
 #endif