(nuttx) 03/03: armv7-r:MPU fix CONFIG naming to include ARM

[xi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git

commit e0396327a263d63dfdcbcf95d1627d6f2e6daebb
Author: David Sidrane <Da...@NscDg.com>
AuthorDate: Fri May 24 08:13:38 2024 -0700

    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 2023909243..40abae76ab 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 e7e05d7a59..7b4a05511f 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)