boot: zephyr: update NXP MPU define to new name

harristomy · nordicjm · commit 47dc50866d58 · 2025-06-09T15:01:55.000+01:00
Zephyr 4.1 changes `CONFIG_CPU_HAS_NXP_MPU` to `CONFIG_CPU_HAS_NXP_SYSMPU`. This change reflects that.

Signed-off-by: Harris Tomy &lt;harristomy@gmail.com&gt;
diff --git a/boot/zephyr/arm_cleanup.c b/boot/zephyr/arm_cleanup.c
@@ -7,7 +7,7 @@
 #include <zephyr/toolchain.h>
 
 #include <cmsis_core.h>
-#if CONFIG_CPU_HAS_NXP_MPU
+#if CONFIG_CPU_HAS_NXP_SYSMPU
 #include <fsl_sysmpu.h>
 #endif
 
@@ -38,7 +38,7 @@ __weak void z_arm_clear_arm_mpu_config(void)
 		ARM_MPU_ClrRegion(i);
 	}
 }
-#elif CONFIG_CPU_HAS_NXP_MPU
+#elif CONFIG_CPU_HAS_NXP_SYSMPU
 __weak void z_arm_clear_arm_mpu_config(void)
 {
 	int i;
diff --git 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) || defined(CONFIG_CPU_HAS_NXP_MPU)
+#if defined(CONFIG_CPU_HAS_ARM_MPU) || defined(CONFIG_CPU_HAS_NXP_SYSMPU)
 /**
  * Cleanup all ARM MPU region configuration
  */
diff --git a/boot/zephyr/main.c b/boot/zephyr/main.c
@@ -192,7 +192,7 @@ static void do_boot(struct boot_rsp *rsp)
     sys_cache_data_disable();
 #endif
 
-#if CONFIG_CPU_HAS_ARM_MPU || CONFIG_CPU_HAS_NXP_MPU
+#if CONFIG_CPU_HAS_ARM_MPU || CONFIG_CPU_HAS_NXP_SYSMPU
     z_arm_clear_arm_mpu_config();
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#include <zephyr/toolchain.h>`
`8`	`8`
`9`	`9`	`#include <cmsis_core.h>`
`10`		`-#if CONFIG_CPU_HAS_NXP_MPU`
	`10`	`+#if CONFIG_CPU_HAS_NXP_SYSMPU`
`11`	`11`	`#include <fsl_sysmpu.h>`
`12`	`12`	`#endif`
`13`	`13`
`@@ -38,7 +38,7 @@ __weak void z_arm_clear_arm_mpu_config(void)`
`38`	`38`	`ARM_MPU_ClrRegion(i);`
`39`	`39`	`}`
`40`	`40`	`}`
`41`		`-#elif CONFIG_CPU_HAS_NXP_MPU`
	`41`	`+#elif CONFIG_CPU_HAS_NXP_SYSMPU`
`42`	`42`	`__weak void z_arm_clear_arm_mpu_config(void)`
`43`	`43`	`{`
`44`	`44`	`int i;`