michaelh/zephyr
1
0
Fork 0
Code Releases Activity

arch: arm: cortex_m: scb: fix MPU code compilation guards

Browse source 
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 <gerard.marull@nordicsemi.no>
This commit is contained in:
Gerard Marull-Paretas 2023-06-29 21:27:38 +02:00 • committed by Carles Cufí
commit 33b116407b
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
arch/arm/core/aarch32/cortex_m/scb.c
View file

@ -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++) {