michaelh/zephyr
1
0
Fork 0
Code Releases Activity

arch: arm: aarch32: Use mpu headers from common aarch32 location

Browse source 
The mpu headers moved in order to support the Cortex-R mpu in later
commits.  Use the new locations.

Signed-off-by: Bradley Bolen <bbolen@lexmark.com>
This commit is contained in:
Bradley Bolen 2020-08-29 23:56:19 -04:00 • committed by Carles Cufí
commit 3b6707f140
7 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/arch/arm/aarch32/arch.h
View file

@ -184,10 +184,10 @@ extern "C" {
/* Legacy case: retain containing extern "C" with C++ */
#ifdef CONFIG_ARM_MPU
#ifdef CONFIG_CPU_HAS_ARM_MPU
#include <arch/arm/aarch32/cortex_m/mpu/arm_mpu.h>
#include <arch/arm/aarch32/mpu/arm_mpu.h>
#endif /* CONFIG_CPU_HAS_ARM_MPU */
#ifdef CONFIG_CPU_HAS_NXP_MPU
#include <arch/arm/aarch32/cortex_m/mpu/nxp_mpu.h>
#include <arch/arm/aarch32/mpu/nxp_mpu.h>
#endif /* CONFIG_CPU_HAS_NXP_MPU */
#endif /* CONFIG_ARM_MPU */

4
include/arch/arm/aarch32/mpu/arm_mpu.h
View file

@ -10,11 +10,11 @@
defined(CONFIG_CPU_CORTEX_M3) || \
defined(CONFIG_CPU_CORTEX_M4) || \
defined(CONFIG_CPU_CORTEX_M7)
#include <arch/arm/aarch32/cortex_m/mpu/arm_mpu_v7m.h>
#include <arch/arm/aarch32/mpu/arm_mpu_v7m.h>
#elif defined(CONFIG_CPU_CORTEX_M23) || \
defined(CONFIG_CPU_CORTEX_M33) || \
defined(CONFIG_CPU_CORTEX_M55)
#include <arch/arm/aarch32/cortex_m/mpu/arm_mpu_v8m.h>
#include <arch/arm/aarch32/mpu/arm_mpu_v8m.h>
#else
#error "Unsupported ARM CPU"
#endif

2
soc/arm/common/cortex_m/arm_mpu_mem_cfg.h
View file

@ -6,7 +6,7 @@
#ifndef _ARM_CORTEX_M_MPU_MEM_CFG_H_
#define _ARM_CORTEX_M_MPU_MEM_CFG_H_
#include <arch/arm/aarch32/cortex_m/mpu/arm_mpu.h>
#include <arch/arm/aarch32/mpu/arm_mpu.h>
#if !defined(CONFIG_ARMV8_M_BASELINE) && !defined(CONFIG_ARMV8_M_MAINLINE)

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

@ -5,7 +5,7 @@
*/
#include <sys/slist.h>
#include <arch/arm/aarch32/cortex_m/mpu/arm_mpu.h>
#include <arch/arm/aarch32/mpu/arm_mpu.h>
#include "arm_mpu_mem_cfg.h"

2
soc/arm/nxp_kinetis/k6x/nxp_mpu_regions.c
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <soc.h>
#include <arch/arm/aarch32/cortex_m/mpu/nxp_mpu.h>
#include <arch/arm/aarch32/mpu/nxp_mpu.h>
static const struct nxp_mpu_region mpu_regions[] = {
/* Region 0 */

2
soc/arm/nxp_kinetis/k8x/nxp_mpu_regions.c
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <soc.h>
#include <arch/arm/aarch32/cortex_m/mpu/nxp_mpu.h>
#include <arch/arm/aarch32/mpu/nxp_mpu.h>
static const struct nxp_mpu_region mpu_regions[] = {
/* Region 0 */

2
soc/arm/nxp_kinetis/ke1xf/nxp_mpu_regions.c
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <soc.h>
#include <arch/arm/aarch32/cortex_m/mpu/nxp_mpu.h>
#include <arch/arm/aarch32/mpu/nxp_mpu.h>
static const struct nxp_mpu_region mpu_regions[] = {
/* Region 0 */