soc: arm: common: cortex_m: Move arm_mpu_mem_cfg.h
Move arm_mpu_mem_cfg header to common include directory.
The benefits are two-fold:
- Allow for out of tree SoC definitions to use them to
define mpu_regions.
- Remove odd relative include path
Signed-off-by: Moritz Fischer <moritzf@google.com>
diff --git a/soc/arm/common/cortex_m/arm_mpu_mem_cfg.h b/include/zephyr/arch/arm/aarch32/cortex_m/arm_mpu_mem_cfg.h
similarity index 100%
rename from soc/arm/common/cortex_m/arm_mpu_mem_cfg.h
rename to include/zephyr/arch/arm/aarch32/cortex_m/arm_mpu_mem_cfg.h
diff --git a/soc/arm/common/cortex_m/arm_mpu_regions.c b/soc/arm/common/cortex_m/arm_mpu_regions.c
index 512cd44..557079ef 100644
--- a/soc/arm/common/cortex_m/arm_mpu_regions.c
+++ b/soc/arm/common/cortex_m/arm_mpu_regions.c
@@ -8,7 +8,7 @@
#include <zephyr/arch/arm/aarch32/mpu/arm_mpu.h>
#include <zephyr/devicetree/memory-attr.h>
-#include "arm_mpu_mem_cfg.h"
+#include <zephyr/arch/arm/aarch32/cortex_m/arm_mpu_mem_cfg.h>
static const struct arm_mpu_region mpu_regions[] = {
/* Region 0 */
diff --git a/soc/arm/nuvoton_npcx/npcx7/mpu_regions.c b/soc/arm/nuvoton_npcx/npcx7/mpu_regions.c
index b8a2cc2..7592a2e 100644
--- a/soc/arm/nuvoton_npcx/npcx7/mpu_regions.c
+++ b/soc/arm/nuvoton_npcx/npcx7/mpu_regions.c
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-#include "../../common/cortex_m/arm_mpu_mem_cfg.h"
+#include <zephyr/arch/arm/aarch32/cortex_m/arm_mpu_mem_cfg.h>
static const struct arm_mpu_region mpu_regions[] = {
MPU_REGION_ENTRY("FLASH_0_0",
diff --git a/soc/arm/nxp_imx/mimx8ml8_m7/mpu_regions.c b/soc/arm/nxp_imx/mimx8ml8_m7/mpu_regions.c
index f2771d5..7964712 100644
--- a/soc/arm/nxp_imx/mimx8ml8_m7/mpu_regions.c
+++ b/soc/arm/nxp_imx/mimx8ml8_m7/mpu_regions.c
@@ -5,7 +5,7 @@
*/
#include <zephyr/devicetree.h>
-#include "../../common/cortex_m/arm_mpu_mem_cfg.h"
+#include <zephyr/arch/arm/aarch32/cortex_m/arm_mpu_mem_cfg.h>
#define REGION_MASK_BASE_ADDRESS 0x00000000U
#define REGION_ITCM_BASE_ADDRESS 0x00000000U
diff --git a/soc/arm/nxp_imx/rt/mpu_regions.c b/soc/arm/nxp_imx/rt/mpu_regions.c
index 5340200..663e448 100644
--- a/soc/arm/nxp_imx/rt/mpu_regions.c
+++ b/soc/arm/nxp_imx/rt/mpu_regions.c
@@ -8,7 +8,7 @@
#include <zephyr/devicetree.h>
#include <zephyr/devicetree/memory-attr.h>
-#include "../../common/cortex_m/arm_mpu_mem_cfg.h"
+#include <zephyr/arch/arm/aarch32/cortex_m/arm_mpu_mem_cfg.h>
static const struct arm_mpu_region mpu_regions[] = {
/* Region 0 */
diff --git a/soc/arm/nxp_s32/s32k/mpu_regions.c b/soc/arm/nxp_s32/s32k/mpu_regions.c
index cc52e0b..9c4316d 100644
--- a/soc/arm/nxp_s32/s32k/mpu_regions.c
+++ b/soc/arm/nxp_s32/s32k/mpu_regions.c
@@ -6,7 +6,7 @@
#include <zephyr/devicetree.h>
#include <zephyr/linker/devicetree_regions.h>
-#include "../../common/cortex_m/arm_mpu_mem_cfg.h"
+#include <zephyr/arch/arm/aarch32/cortex_m/arm_mpu_mem_cfg.h>
#if !defined(CONFIG_XIP)
extern char _rom_attr[];
diff --git a/soc/arm/st_stm32/stm32h7/mpu_regions.c b/soc/arm/st_stm32/stm32h7/mpu_regions.c
index e253d70..16706e3 100644
--- a/soc/arm/st_stm32/stm32h7/mpu_regions.c
+++ b/soc/arm/st_stm32/stm32h7/mpu_regions.c
@@ -5,7 +5,7 @@
*/
#include <zephyr/devicetree.h>
-#include "../../common/cortex_m/arm_mpu_mem_cfg.h"
+#include <zephyr/arch/arm/aarch32/cortex_m/arm_mpu_mem_cfg.h>
static const struct arm_mpu_region mpu_regions[] = {
MPU_REGION_ENTRY("FLASH", CONFIG_FLASH_BASE_ADDRESS,
