From e936cb28446e0edb8ce11df26a31c12b372ea8d3 Mon Sep 17 00:00:00 2001 From: Gerard Marull-Paretas Date: Thu, 29 Jun 2023 21:27:38 +0200 Subject: [PATCH] arch: arm: cortex_m: scb: fix MPU code compilation guards The implementation of `z_arm_clear_arm_mpu_config` was compiled for all ARM cores that declare to have an MPU. However, we only want to compile it if the MPU is actually enabled. Signed-off-by: Gerard Marull-Paretas --- arch/arm/core/aarch32/cortex_m/scb.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/core/aarch32/cortex_m/scb.c b/arch/arm/core/aarch32/cortex_m/scb.c index 5c664166ff9efd..3e19db8b43bdee 100644 --- a/arch/arm/core/aarch32/cortex_m/scb.c +++ b/arch/arm/core/aarch32/cortex_m/scb.c @@ -41,6 +41,7 @@ void __weak sys_arch_reboot(int type) NVIC_SystemReset(); } +#if defined(CONFIG_ARM_MPU) #if defined(CONFIG_CPU_HAS_ARM_MPU) /** * @@ -75,6 +76,7 @@ void z_arm_clear_arm_mpu_config(void) } } #endif /* CONFIG_CPU_HAS_NXP_MPU */ +#endif /* CONFIG_ARM_MPU */ #if defined(CONFIG_INIT_ARCH_HW_AT_BOOT) /** @@ -96,10 +98,10 @@ void z_arm_init_arch_hw_at_boot(void) /* Initialize System Control Block components */ -#if defined(CONFIG_CPU_HAS_ARM_MPU) || defined(CONFIG_CPU_HAS_NXP_MPU) +#if defined(CONFIG_ARM_MPU) /* Clear MPU region configuration */ z_arm_clear_arm_mpu_config(); -#endif /* CONFIG_CPU_HAS_ARM_MPU */ +#endif /* CONFIG_ARM_MPU */ /* Disable NVIC interrupts */ for (uint8_t i = 0; i < ARRAY_SIZE(NVIC->ICER); i++) {