michaelh/zephyr
1
0
Fork 0
Code Releases Activity

soc: arm: common: cortex_m: Move arm_mpu_mem_cfg.h

Browse source 
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>
This commit is contained in:
Moritz Fischer 2023-08-08 20:21:55 -07:00 • committed by Carles Cufí
commit 9e8a8b4e85
7 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

0
soc/arm/common/cortex_m/arm_mpu_mem_cfg.h → include/zephyr/arch/arm/aarch32/cortex_m/arm_mpu_mem_cfg.h
View file

2
soc/arm/common/cortex_m/arm_mpu_regions.c
View file

@ -8,7 +8,7 @@
#include <zephyr/arch/arm/aarch32/mpu/arm_mpu.h> #include <zephyr/arch/arm/aarch32/mpu/arm_mpu.h>
#include <zephyr/devicetree/memory-attr.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[] = { static const struct arm_mpu_region mpu_regions[] = {
/* Region 0 */ /* Region 0 */

2
soc/arm/nuvoton_npcx/npcx7/mpu_regions.c
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0 * 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[] = { static const struct arm_mpu_region mpu_regions[] = {
MPU_REGION_ENTRY("FLASH_0_0", MPU_REGION_ENTRY("FLASH_0_0",

2
soc/arm/nxp_imx/mimx8ml8_m7/mpu_regions.c
View file

@ -5,7 +5,7 @@
*/ */
#include <zephyr/devicetree.h> #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_MASK_BASE_ADDRESS 0x00000000U
#define REGION_ITCM_BASE_ADDRESS 0x00000000U #define REGION_ITCM_BASE_ADDRESS 0x00000000U

2
soc/arm/nxp_imx/rt/mpu_regions.c
View file

@ -8,7 +8,7 @@
#include <zephyr/devicetree.h> #include <zephyr/devicetree.h>
#include <zephyr/devicetree/memory-attr.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[] = { static const struct arm_mpu_region mpu_regions[] = {
/* Region 0 */ /* Region 0 */

2
soc/arm/nxp_s32/s32k/mpu_regions.c
View file

@ -6,7 +6,7 @@
#include <zephyr/devicetree.h> #include <zephyr/devicetree.h>
#include <zephyr/linker/devicetree_regions.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) #if !defined(CONFIG_XIP)
extern char _rom_attr[]; extern char _rom_attr[];

2
soc/arm/st_stm32/stm32h7/mpu_regions.c
View file

@ -5,7 +5,7 @@
*/ */
#include <zephyr/devicetree.h> #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[] = { static const struct arm_mpu_region mpu_regions[] = {
MPU_REGION_ENTRY("FLASH", CONFIG_FLASH_BASE_ADDRESS, MPU_REGION_ENTRY("FLASH", CONFIG_FLASH_BASE_ADDRESS,