From c4cd4cfe7f759eddf921f1bd21e68641185a8a27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Zi=C4=99cik?= Date: Thu, 9 Aug 2018 12:33:49 +0200 Subject: [PATCH] arch: beetle: Remove ARM_MPU_ENABLE option. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The ARM_MPU_ENABLE option is just selecting ARM_MPU option, which could be also controlled through menuconfig. This commit removes the ARM_MPU_ENABLE option and replaces its usage by ARM_MPU option. Signed-off-by: Piotr Zięcik --- boards/arm/v2m_beetle/v2m_beetle_defconfig | 3 ++- soc/arm/arm/beetle/CMakeLists.txt | 2 +- soc/arm/arm/beetle/Kconfig.soc | 7 ------- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/boards/arm/v2m_beetle/v2m_beetle_defconfig b/boards/arm/v2m_beetle/v2m_beetle_defconfig index 2ee71a77b38..f812f0bda81 100644 --- a/boards/arm/v2m_beetle/v2m_beetle_defconfig +++ b/boards/arm/v2m_beetle/v2m_beetle_defconfig @@ -16,8 +16,9 @@ CONFIG_RUNTIME_NMI=y CONFIG_CLOCK_CONTROL=y # 24MHz system clock CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=24000000 + # Enable MPU -CONFIG_ARM_MPU_ENABLE=y +CONFIG_ARM_MPU=y # GPIOs CONFIG_GPIO=y diff --git a/soc/arm/arm/beetle/CMakeLists.txt b/soc/arm/arm/beetle/CMakeLists.txt index f4544967ce0..2b8ae1e38e2 100644 --- a/soc/arm/arm/beetle/CMakeLists.txt +++ b/soc/arm/arm/beetle/CMakeLists.txt @@ -2,4 +2,4 @@ zephyr_sources( soc.c power.c ) -zephyr_sources_ifdef(CONFIG_ARM_MPU_ENABLE arm_mpu_regions.c) +zephyr_sources_ifdef(CONFIG_ARM_MPU arm_mpu_regions.c) diff --git a/soc/arm/arm/beetle/Kconfig.soc b/soc/arm/arm/beetle/Kconfig.soc index dd3fe6b2d94..7972d329e62 100644 --- a/soc/arm/arm/beetle/Kconfig.soc +++ b/soc/arm/arm/beetle/Kconfig.soc @@ -14,10 +14,3 @@ config SOC_BEETLE_R0 bool "ARM BEETLE R0" endchoice - -config ARM_MPU_ENABLE - bool "Enable MPU on ARM Beetle" - depends on CPU_HAS_MPU - select ARM_MPU - help - Enable MPU support on ARM Beetle SoCs