From 53307ea9b2c200a03f1654cf33d2efa9bbddafc6 Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Fri, 24 May 2024 08:04:36 -0700 Subject: [PATCH] armv7-m:MPU fix CONFIG naming to include ARM --- arch/arm/src/armv7-m/arm_mpu.c | 4 ++-- arch/arm/src/armv7-m/mpu.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/src/armv7-m/arm_mpu.c b/arch/arm/src/armv7-m/arm_mpu.c index 7a35108495a..3e04442cf8f 100644 --- a/arch/arm/src/armv7-m/arm_mpu.c +++ b/arch/arm/src/armv7-m/arm_mpu.c @@ -185,7 +185,7 @@ static inline uint32_t mpu_subregion_ls(size_t offset, uint8_t l2size) * ****************************************************************************/ -#if defined(CONFIG_MPU_RESET) || defined(CONFIG_ARM_MPU_EARLY_RESET) +#if defined(CONFIG_ARM_MPU_RESET) || defined(CONFIG_ARM_MPU_EARLY_RESET) static void mpu_reset_internal() { int region; @@ -423,7 +423,7 @@ void mpu_configure_region(uintptr_t base, size_t size, * MPU initialization. * ****************************************************************************/ -#if defined(CONFIG_MPU_RESET) +#if defined(CONFIG_ARM_MPU_RESET) void mpu_reset() { mpu_reset_internal(); diff --git a/arch/arm/src/armv7-m/mpu.h b/arch/arm/src/armv7-m/mpu.h index 18c24ff0fe8..b75f03c2040 100644 --- a/arch/arm/src/armv7-m/mpu.h +++ b/arch/arm/src/armv7-m/mpu.h @@ -139,7 +139,7 @@ * ****************************************************************************/ -#if defined(CONFIG_MPU_RESET) +#if defined(CONFIG_ARM_MPU_RESET) void mpu_reset(void); #else # define mpu_reset()