From 6fbb26eb521999844f099ac93974fdc7ccca6016 Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Fri, 24 May 2024 08:13:38 -0700 Subject: [PATCH] [BACKPORT] armv7-r:MPU fix CONFIG naming to include ARM --- arch/arm/src/armv7-r/arm_mpu.c | 4 ++-- arch/arm/src/armv7-r/mpu.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/src/armv7-r/arm_mpu.c b/arch/arm/src/armv7-r/arm_mpu.c index 20239092432..40abae76ab5 100644 --- a/arch/arm/src/armv7-r/arm_mpu.c +++ b/arch/arm/src/armv7-r/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; @@ -336,7 +336,7 @@ uint32_t mpu_subregion(uintptr_t base, size_t size, uint8_t l2size) * 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-r/mpu.h b/arch/arm/src/armv7-r/mpu.h index 5029b12fdc0..914b3d1cc25 100644 --- a/arch/arm/src/armv7-r/mpu.h +++ b/arch/arm/src/armv7-r/mpu.h @@ -128,7 +128,7 @@ extern "C" * ****************************************************************************/ -#if defined(CONFIG_MPU_RESET) +#if defined(CONFIG_ARM_MPU_RESET) void mpu_reset(void); #else # define mpu_reset() do { } while (0)