michaelh/zephyr
1
0
Fork 0
Code Releases Activity

arch: beetle: Remove ARM_MPU_ENABLE option.

Browse source 
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 <piotr.ziecik@nordicsemi.no>
This commit is contained in:
Piotr Zięcik 2018-08-09 12:33:49 +02:00 • committed by Carles Cufí
commit c4cd4cfe7f
3 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
boards/arm/v2m_beetle/v2m_beetle_defconfig
View file

@ -16,8 +16,9 @@ CONFIG_RUNTIME_NMI=y
CONFIG_CLOCK_CONTROL=y CONFIG_CLOCK_CONTROL=y
# 24MHz system clock # 24MHz system clock
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=24000000 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=24000000
# Enable MPU # Enable MPU
CONFIG_ARM_MPU_ENABLE=y CONFIG_ARM_MPU=y
# GPIOs # GPIOs
CONFIG_GPIO=y CONFIG_GPIO=y

2
soc/arm/arm/beetle/CMakeLists.txt
View file

@ -2,4 +2,4 @@ zephyr_sources(
soc.c soc.c
power.c power.c
) )
zephyr_sources_ifdef(CONFIG_ARM_MPU_ENABLE arm_mpu_regions.c) zephyr_sources_ifdef(CONFIG_ARM_MPU arm_mpu_regions.c)

7
soc/arm/arm/beetle/Kconfig.soc
View file

@ -14,10 +14,3 @@ config SOC_BEETLE_R0
bool "ARM BEETLE R0" bool "ARM BEETLE R0"
endchoice 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