From edfcab428b779a2ea88e8e67fb90e87287763d08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Zi=C4=99cik?= Date: Thu, 9 Aug 2018 13:43:26 +0200 Subject: [PATCH] arch: nxp_imx: Remove ARM_MPU_IMX_RT option. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The ARM_MPU_IMX_RT option is just selecting ARM_MPU option, which could be also controlled through menuconfig. This commit removes the ARM_MPU_IMX_RT option and replaces its usage by ARM_MPU option. Signed-off-by: Piotr Zięcik --- boards/arm/mimxrt1050_evk/mimxrt1050_evk_defconfig | 2 +- soc/arm/nxp_imx/rt/CMakeLists.txt | 2 +- soc/arm/nxp_imx/rt/Kconfig.soc | 7 ------- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/boards/arm/mimxrt1050_evk/mimxrt1050_evk_defconfig b/boards/arm/mimxrt1050_evk/mimxrt1050_evk_defconfig index 81b9ea73feb..b59635f7026 100644 --- a/boards/arm/mimxrt1050_evk/mimxrt1050_evk_defconfig +++ b/boards/arm/mimxrt1050_evk/mimxrt1050_evk_defconfig @@ -14,4 +14,4 @@ CONFIG_SERIAL=y CONFIG_CORTEX_M_SYSTICK=y CONFIG_GPIO=y CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=600000000 -CONFIG_ARM_MPU_IMX_RT=y +CONFIG_ARM_MPU=y diff --git a/soc/arm/nxp_imx/rt/CMakeLists.txt b/soc/arm/nxp_imx/rt/CMakeLists.txt index da750c2be74..31628a73879 100644 --- a/soc/arm/nxp_imx/rt/CMakeLists.txt +++ b/soc/arm/nxp_imx/rt/CMakeLists.txt @@ -8,4 +8,4 @@ zephyr_sources( soc.c ) -zephyr_sources_ifdef(CONFIG_ARM_MPU_IMX_RT arm_mpu_regions.c) +zephyr_sources_ifdef(CONFIG_ARM_MPU arm_mpu_regions.c) diff --git a/soc/arm/nxp_imx/rt/Kconfig.soc b/soc/arm/nxp_imx/rt/Kconfig.soc index c5eb92ccfe5..36c36cfb581 100644 --- a/soc/arm/nxp_imx/rt/Kconfig.soc +++ b/soc/arm/nxp_imx/rt/Kconfig.soc @@ -39,13 +39,6 @@ endchoice if SOC_SERIES_IMX_RT -config ARM_MPU_IMX_RT - bool "Enable MPU on i.MX RT" - depends on CPU_HAS_MPU - select ARM_MPU - help - Enable MPU support on NXP i.MX RT series SoCs. - config SOC_PART_NUMBER_MIMXRT1051CVL5A bool