From 9709d29b87a3888412ffda586e16eba86adccfe7 Mon Sep 17 00:00:00 2001
From: JerryH <huangjieliang@huawei.com>
Date: Tue, 10 Aug 2021 19:27:14 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0MPU=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E7=9A=84=E5=BC=80=E5=85=B3=E5=AE=8F=EF=BC=8C=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

close #I3WE0S

Signed-off-by: JerryH <huangjieliang@huawei.com>
Change-Id: Id193fd555877ac0c6b5b43e5dd5ede32531b86c4
---
 kernel/arch/arm/cortex-m4/gcc/los_mpu.c | 3 ++-
 kernel/arch/arm/cortex-m4/iar/los_mpu.c | 3 ++-
 kernel/arch/arm/cortex-m7/iar/los_mpu.c | 3 ++-
 kernel/include/los_config.h             | 8 ++++++++
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/kernel/arch/arm/cortex-m4/gcc/los_mpu.c b/kernel/arch/arm/cortex-m4/gcc/los_mpu.c
index 0351a259..25eb87fb 100644
--- a/kernel/arch/arm/cortex-m4/gcc/los_mpu.c
+++ b/kernel/arch/arm/cortex-m4/gcc/los_mpu.c
@@ -32,6 +32,7 @@
 #include "los_config.h"
 #include "los_context.h"
 
+#if (LOSCFG_MPU_ENABLE == 1)
 
 #define SIZE_4G_BYTE        0x100000000
 #define MPU_MAX_REGION_NUM  8
@@ -233,4 +234,4 @@ INT32 HalMpuUnusedRegionGet(VOID)
         return id;
     }
 }
-
+#endif
diff --git a/kernel/arch/arm/cortex-m4/iar/los_mpu.c b/kernel/arch/arm/cortex-m4/iar/los_mpu.c
index 0351a259..25eb87fb 100644
--- a/kernel/arch/arm/cortex-m4/iar/los_mpu.c
+++ b/kernel/arch/arm/cortex-m4/iar/los_mpu.c
@@ -32,6 +32,7 @@
 #include "los_config.h"
 #include "los_context.h"
 
+#if (LOSCFG_MPU_ENABLE == 1)
 
 #define SIZE_4G_BYTE        0x100000000
 #define MPU_MAX_REGION_NUM  8
@@ -233,4 +234,4 @@ INT32 HalMpuUnusedRegionGet(VOID)
         return id;
     }
 }
-
+#endif
diff --git a/kernel/arch/arm/cortex-m7/iar/los_mpu.c b/kernel/arch/arm/cortex-m7/iar/los_mpu.c
index 0351a259..25eb87fb 100644
--- a/kernel/arch/arm/cortex-m7/iar/los_mpu.c
+++ b/kernel/arch/arm/cortex-m7/iar/los_mpu.c
@@ -32,6 +32,7 @@
 #include "los_config.h"
 #include "los_context.h"
 
+#if (LOSCFG_MPU_ENABLE == 1)
 
 #define SIZE_4G_BYTE        0x100000000
 #define MPU_MAX_REGION_NUM  8
@@ -233,4 +234,4 @@ INT32 HalMpuUnusedRegionGet(VOID)
         return id;
     }
 }
-
+#endif
diff --git a/kernel/include/los_config.h b/kernel/include/los_config.h
index 722952c7..9736db28 100644
--- a/kernel/include/los_config.h
+++ b/kernel/include/los_config.h
@@ -765,6 +765,14 @@ extern UINT8 *m_aucSysMem0;
 #define LOSCFG_SECURE_STACK_DEFAULT_SIZE                     512
 #endif
 
+/**
+ * @ingroup los_config
+ * Configuration item for mpu.
+ */
+#ifndef LOSCFG_MPU_ENABLE
+#define LOSCFG_MPU_ENABLE                                    0
+#endif
+
 #ifdef __cplusplus
 #if __cplusplus
 }
-- 
GitLab