soc: move arm cortex_m common mpu code to arch/arm/core/mpu
Locate common mpu code together with other arm / nxp mpu code in the arch folder where it logically belongs. Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
This commit is contained in:
parent
a9b59dc65e
commit
3e82eb976e
4 changed files with 5 additions and 16 deletions
|
@ -6,6 +6,11 @@ zephyr_library_sources( arm_core_mpu.c)
|
|||
zephyr_library_sources_ifdef(CONFIG_CPU_HAS_ARM_MPU arm_mpu.c)
|
||||
zephyr_library_sources_ifdef(CONFIG_CPU_HAS_NXP_MPU nxp_mpu.c)
|
||||
|
||||
if(CONFIG_CPU_CORTEX_M AND NOT CONFIG_CPU_HAS_CUSTOM_FIXED_SOC_MPU_REGIONS)
|
||||
zephyr_library_sources_ifdef(CONFIG_CPU_HAS_ARM_MPU arm_mpu_regions.c)
|
||||
zephyr_library_sources_ifdef(CONFIG_CPU_HAS_NXP_MPU nxp_mpu_regions.c)
|
||||
endif()
|
||||
|
||||
if (CONFIG_CPU_AARCH32_CORTEX_R)
|
||||
zephyr_library_include_directories(cortex_a_r)
|
||||
elseif (CONFIG_CPU_CORTEX_M)
|
||||
|
|
|
@ -1,10 +1,7 @@
|
|||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
add_subdirectory_ifdef(CONFIG_CPU_CORTEX_M common/cortex_m)
|
||||
|
||||
if(SOC_FAMILY)
|
||||
add_subdirectory(${SOC_FAMILY})
|
||||
else()
|
||||
add_subdirectory(${SOC_NAME})
|
||||
endif()
|
||||
|
||||
|
|
|
@ -1,13 +0,0 @@
|
|||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
if(CONFIG_ARM_MPU AND NOT CONFIG_CPU_HAS_CUSTOM_FIXED_SOC_MPU_REGIONS)
|
||||
|
||||
zephyr_library()
|
||||
|
||||
zephyr_library_sources_ifdef(CONFIG_CPU_HAS_ARM_MPU
|
||||
arm_mpu_regions.c
|
||||
)
|
||||
zephyr_library_sources_ifdef(CONFIG_CPU_HAS_NXP_MPU
|
||||
nxp_mpu_regions.c
|
||||
)
|
||||
endif()
|
Loading…
Add table
Add a link
Reference in a new issue