From bee70b4ca8a648629b4afa9f61a3aa46f1009503 Mon Sep 17 00:00:00 2001 From: Ioannis Glaropoulos Date: Fri, 6 Dec 2019 13:32:30 +0100 Subject: [PATCH] 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 --- soc/arm/arm/beetle/CMakeLists.txt | 1 - soc/arm/arm/beetle/arm_mpu_regions.c | 24 ------------------ soc/arm/arm/mps2/CMakeLists.txt | 1 - soc/arm/arm/mps2/arm_mpu_regions.c | 35 -------------------------- soc/arm/arm/musca_a/CMakeLists.txt | 1 - soc/arm/arm/musca_a/arm_mpu_regions.c | 26 ------------------- soc/arm/arm/musca_b1/CMakeLists.txt | 1 - soc/arm/arm/musca_b1/arm_mpu_regions.c | 26 ------------------- 8 files changed, 115 deletions(-) delete mode 100644 soc/arm/arm/beetle/arm_mpu_regions.c delete mode 100644 soc/arm/arm/mps2/arm_mpu_regions.c delete mode 100644 soc/arm/arm/musca_a/arm_mpu_regions.c delete mode 100644 soc/arm/arm/musca_b1/arm_mpu_regions.c diff --git a/soc/arm/arm/beetle/CMakeLists.txt b/soc/arm/arm/beetle/CMakeLists.txt index a16e7981d14..3fd95157dfc 100644 --- a/soc/arm/arm/beetle/CMakeLists.txt +++ b/soc/arm/arm/beetle/CMakeLists.txt @@ -4,4 +4,3 @@ zephyr_sources( soc.c power.c ) -zephyr_sources_ifdef(CONFIG_ARM_MPU arm_mpu_regions.c) diff --git a/soc/arm/arm/beetle/arm_mpu_regions.c b/soc/arm/arm/beetle/arm_mpu_regions.c deleted file mode 100644 index 18dfde0aa1c..00000000000 --- a/soc/arm/arm/beetle/arm_mpu_regions.c +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (c) 2017 Linaro Limited. - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#include -#include - -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, -}; diff --git a/soc/arm/arm/mps2/CMakeLists.txt b/soc/arm/arm/mps2/CMakeLists.txt index 5231a57f6ca..332416ba43b 100644 --- a/soc/arm/arm/mps2/CMakeLists.txt +++ b/soc/arm/arm/mps2/CMakeLists.txt @@ -2,5 +2,4 @@ zephyr_sources( soc.c - arm_mpu_regions.c ) diff --git a/soc/arm/arm/mps2/arm_mpu_regions.c b/soc/arm/arm/mps2/arm_mpu_regions.c deleted file mode 100644 index e9b940ab8d9..00000000000 --- a/soc/arm/arm/mps2/arm_mpu_regions.c +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2017-2019 Linaro Limited. - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#include - -#include -#include - -#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, -}; diff --git a/soc/arm/arm/musca_a/CMakeLists.txt b/soc/arm/arm/musca_a/CMakeLists.txt index c279a10318e..ae3f7d6c3be 100644 --- a/soc/arm/arm/musca_a/CMakeLists.txt +++ b/soc/arm/arm/musca_a/CMakeLists.txt @@ -6,5 +6,4 @@ zephyr_sources( soc.c - arm_mpu_regions.c ) diff --git a/soc/arm/arm/musca_a/arm_mpu_regions.c b/soc/arm/arm/musca_a/arm_mpu_regions.c deleted file mode 100644 index 38d6f91afe6..00000000000 --- a/soc/arm/arm/musca_a/arm_mpu_regions.c +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2018 Linaro Limited. - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#include -#include - -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, -}; diff --git a/soc/arm/arm/musca_b1/CMakeLists.txt b/soc/arm/arm/musca_b1/CMakeLists.txt index c279a10318e..ae3f7d6c3be 100644 --- a/soc/arm/arm/musca_b1/CMakeLists.txt +++ b/soc/arm/arm/musca_b1/CMakeLists.txt @@ -6,5 +6,4 @@ zephyr_sources( soc.c - arm_mpu_regions.c ) diff --git a/soc/arm/arm/musca_b1/arm_mpu_regions.c b/soc/arm/arm/musca_b1/arm_mpu_regions.c deleted file mode 100644 index 38d6f91afe6..00000000000 --- a/soc/arm/arm/musca_b1/arm_mpu_regions.c +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2018 Linaro Limited. - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#include -#include - -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, -};