You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2024/05/25 04:06:58 UTC

(nuttx) branch master updated (cfa544357e -> e0396327a2)

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

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


    from cfa544357e mpfs_mpu: Check that size is valid for MPUCFG
     new 53307ea9b2 armv7-m:MPU fix CONFIG naming to include ARM
     new 602e69a810 armv8-m:MPU fix CONFIG naming to include ARM
     new e0396327a2 armv7-r:MPU fix CONFIG naming to include ARM

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 arch/arm/src/armv7-m/arm_mpu.c | 4 ++--
 arch/arm/src/armv7-m/mpu.h     | 2 +-
 arch/arm/src/armv7-r/arm_mpu.c | 4 ++--
 arch/arm/src/armv7-r/mpu.h     | 2 +-
 arch/arm/src/armv8-m/arm_mpu.c | 4 ++--
 arch/arm/src/armv8-m/mpu.h     | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)


(nuttx) 02/03: armv8-m:MPU fix CONFIG naming to include ARM

Posted by 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 602e69a810c6586f01f541f9f904a3ec5a72c98d
Author: David Sidrane <Da...@NscDg.com>
AuthorDate: Fri May 24 08:12:28 2024 -0700

    armv8-m:MPU fix CONFIG naming to include ARM
---
 arch/arm/src/armv8-m/arm_mpu.c | 4 ++--
 arch/arm/src/armv8-m/mpu.h     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/src/armv8-m/arm_mpu.c b/arch/arm/src/armv8-m/arm_mpu.c
index 327b3a030c..effd078a90 100644
--- a/arch/arm/src/armv8-m/arm_mpu.c
+++ b/arch/arm/src/armv8-m/arm_mpu.c
@@ -79,7 +79,7 @@ unsigned int mpu_allocregion(void)
  *
  ****************************************************************************/
 
-#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;
@@ -184,7 +184,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/armv8-m/mpu.h b/arch/arm/src/armv8-m/mpu.h
index 077eb52a07..8db68a77e9 100644
--- a/arch/arm/src/armv8-m/mpu.h
+++ b/arch/arm/src/armv8-m/mpu.h
@@ -178,7 +178,7 @@
  *
  ****************************************************************************/
 
-#if defined(CONFIG_MPU_RESET)
+#if defined(CONFIG_ARM_MPU_RESET)
 void mpu_reset(void);
 #else
 #  define mpu_reset() do { } while (0)


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

Posted by 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 53307ea9b2c200a03f1654cf33d2efa9bbddafc6
Author: David Sidrane <Da...@NscDg.com>
AuthorDate: Fri May 24 08:04:36 2024 -0700

    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 7a35108495..3e04442cf8 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 18c24ff0fe..b75f03c204 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()


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

Posted by 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)