soc: arm: arm: remove custom fixed MPU region definition
We remove the custom fixed MPU region definition from ARM - Beetle - Musca_a - Musca_b1 - MPS2 (an385 and an521) SoC definitions, as the common fixed MPU region definition is now used. Signed-off-by: Ioannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no>
This commit is contained in:
parent
c9da964752
commit
bee70b4ca8
8 changed files with 0 additions and 115 deletions
|
@ -4,4 +4,3 @@ zephyr_sources(
|
|||
soc.c
|
||||
power.c
|
||||
)
|
||||
zephyr_sources_ifdef(CONFIG_ARM_MPU arm_mpu_regions.c)
|
||||
|
|
|
@ -1,24 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2017 Linaro Limited.
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
#include <soc.h>
|
||||
#include <arch/arm/cortex_m/mpu/arm_mpu.h>
|
||||
|
||||
static const struct arm_mpu_region mpu_regions[] = {
|
||||
/* Region 0 */
|
||||
MPU_REGION_ENTRY("FLASH_0",
|
||||
CONFIG_FLASH_BASE_ADDRESS,
|
||||
REGION_FLASH_ATTR(REGION_256K)),
|
||||
/* Region 1 */
|
||||
MPU_REGION_ENTRY("RAM_0",
|
||||
CONFIG_SRAM_BASE_ADDRESS,
|
||||
REGION_RAM_ATTR(REGION_128K)),
|
||||
};
|
||||
|
||||
const struct arm_mpu_config mpu_config = {
|
||||
.num_regions = ARRAY_SIZE(mpu_regions),
|
||||
.mpu_regions = mpu_regions,
|
||||
};
|
|
@ -2,5 +2,4 @@
|
|||
|
||||
zephyr_sources(
|
||||
soc.c
|
||||
arm_mpu_regions.c
|
||||
)
|
||||
|
|
|
@ -1,35 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2017-2019 Linaro Limited.
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
#include <generated_dts_board.h>
|
||||
|
||||
#include <soc.h>
|
||||
#include <arch/arm/cortex_m/mpu/arm_mpu.h>
|
||||
|
||||
#if defined(CONFIG_ARMV8_M_BASELINE) || \
|
||||
defined(CONFIG_ARMV8_M_MAINLINE)
|
||||
#define MPS2_FLASH_ATTR REGION_FLASH_ATTR(CONFIG_FLASH_BASE_ADDRESS, CONFIG_FLASH_SIZE*1024)
|
||||
#define MPS2_RAM_ATTR REGION_RAM_ATTR(CONFIG_SRAM_BASE_ADDRESS, CONFIG_SRAM_SIZE*1024)
|
||||
#else
|
||||
#define MPS2_FLASH_ATTR REGION_FLASH_ATTR(REGION_4M)
|
||||
#define MPS2_RAM_ATTR REGION_RAM_ATTR(REGION_2M)
|
||||
#endif
|
||||
|
||||
static const struct arm_mpu_region mpu_regions[] = {
|
||||
/* Region 0 */
|
||||
MPU_REGION_ENTRY("FLASH_0",
|
||||
CONFIG_FLASH_BASE_ADDRESS,
|
||||
MPS2_FLASH_ATTR),
|
||||
|
||||
MPU_REGION_ENTRY("SRAM_0",
|
||||
CONFIG_SRAM_BASE_ADDRESS,
|
||||
MPS2_RAM_ATTR)
|
||||
};
|
||||
|
||||
const struct arm_mpu_config mpu_config = {
|
||||
.num_regions = ARRAY_SIZE(mpu_regions),
|
||||
.mpu_regions = mpu_regions,
|
||||
};
|
|
@ -6,5 +6,4 @@
|
|||
|
||||
zephyr_sources(
|
||||
soc.c
|
||||
arm_mpu_regions.c
|
||||
)
|
||||
|
|
|
@ -1,26 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2018 Linaro Limited.
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
#include <soc.h>
|
||||
#include <arch/arm/cortex_m/mpu/arm_mpu.h>
|
||||
|
||||
static const struct arm_mpu_region mpu_regions[] = {
|
||||
/* Region 0 */
|
||||
{ CONFIG_FLASH_BASE_ADDRESS,
|
||||
"FLASH_0",
|
||||
REGION_FLASH_ATTR(CONFIG_FLASH_BASE_ADDRESS,
|
||||
CONFIG_FLASH_SIZE*1024)},
|
||||
/* Region 1 */
|
||||
{ CONFIG_SRAM_BASE_ADDRESS,
|
||||
"SRAM_0",
|
||||
REGION_RAM_ATTR(CONFIG_SRAM_BASE_ADDRESS,
|
||||
CONFIG_SRAM_SIZE*1024)}
|
||||
};
|
||||
|
||||
const struct arm_mpu_config mpu_config = {
|
||||
.num_regions = ARRAY_SIZE(mpu_regions),
|
||||
.mpu_regions = mpu_regions,
|
||||
};
|
|
@ -6,5 +6,4 @@
|
|||
|
||||
zephyr_sources(
|
||||
soc.c
|
||||
arm_mpu_regions.c
|
||||
)
|
||||
|
|
|
@ -1,26 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2018 Linaro Limited.
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
#include <soc.h>
|
||||
#include <arch/arm/cortex_m/mpu/arm_mpu.h>
|
||||
|
||||
static const struct arm_mpu_region mpu_regions[] = {
|
||||
/* Region 0 */
|
||||
{ CONFIG_FLASH_BASE_ADDRESS,
|
||||
"FLASH_0",
|
||||
REGION_FLASH_ATTR(CONFIG_FLASH_BASE_ADDRESS,
|
||||
CONFIG_FLASH_SIZE*1024)},
|
||||
/* Region 1 */
|
||||
{ CONFIG_SRAM_BASE_ADDRESS,
|
||||
"SRAM_0",
|
||||
REGION_RAM_ATTR(CONFIG_SRAM_BASE_ADDRESS,
|
||||
CONFIG_SRAM_SIZE*1024)}
|
||||
};
|
||||
|
||||
const struct arm_mpu_config mpu_config = {
|
||||
.num_regions = ARRAY_SIZE(mpu_regions),
|
||||
.mpu_regions = mpu_regions,
|
||||
};
|
Loading…
Add table
Add a link
Reference in a new issue