patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

arch: stm32: Remove STM32_ARM_MPU_ENABLE option.

Browse source 
The STM32_ARM_MPU_ENABLE option is just selecting ARM_MPU option,
which could be also controlled through menuconfig.

This commit removes the STM32_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:01:21 +02:00 committed by Carles Cufí
parent 461a9de773
commit eb1ee5f1ee
19 changed files with 18 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boards/arm/96b_carbon/96b_carbon_defconfig
View file

@ -7,7 +7,7 @@ CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=84000000
CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
# Enable MPU
CONFIG_STM32_ARM_MPU_ENABLE=y
CONFIG_ARM_MPU=y
CONFIG_SERIAL=y

2
boards/arm/disco_l475_iot1/disco_l475_iot1_defconfig
View file

@ -31,7 +31,7 @@ CONFIG_UART_CONSOLE=y
CONFIG_PWM=y
# enable MPU
CONFIG_STM32_ARM_MPU_ENABLE=y
CONFIG_ARM_MPU=y
# enable I2C
CONFIG_I2C=y

2
boards/arm/nucleo_f401re/nucleo_f401re_defconfig
View file

@ -7,7 +7,7 @@ CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=84000000
CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
# Enable MPU
CONFIG_STM32_ARM_MPU_ENABLE=y
CONFIG_ARM_MPU=y
CONFIG_SERIAL=y

2
boards/arm/nucleo_f411re/nucleo_f411re_defconfig
View file

@ -7,7 +7,7 @@ CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=96000000
CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
# Enable MPU
CONFIG_STM32_ARM_MPU_ENABLE=y
CONFIG_ARM_MPU=y
CONFIG_SERIAL=y

2
boards/arm/nucleo_f412zg/nucleo_f412zg_defconfig
View file

@ -7,7 +7,7 @@ CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=96000000
CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
# Enable MPU
CONFIG_STM32_ARM_MPU_ENABLE=y
CONFIG_ARM_MPU=y
CONFIG_SERIAL=y

2
boards/arm/nucleo_f413zh/nucleo_f413zh_defconfig
View file

@ -7,7 +7,7 @@ CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=96000000
CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
# Enable MPU
CONFIG_STM32_ARM_MPU_ENABLE=y
CONFIG_ARM_MPU=y
CONFIG_SERIAL=y

2
boards/arm/nucleo_f429zi/nucleo_f429zi_defconfig
View file

@ -6,7 +6,7 @@ CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=180000000
CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
# Enable MPU
CONFIG_STM32_ARM_MPU_ENABLE=y
CONFIG_ARM_MPU=y
CONFIG_SERIAL=y

2
boards/arm/nucleo_f446re/nucleo_f446re_defconfig
View file

@ -7,7 +7,7 @@ CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=96000000
CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
# Enable MPU
CONFIG_STM32_ARM_MPU_ENABLE=y
CONFIG_ARM_MPU=y
CONFIG_SERIAL=y

2
boards/arm/nucleo_l476rg/nucleo_l476rg_defconfig
View file

@ -38,4 +38,4 @@ CONFIG_UART_CONSOLE=y
CONFIG_PWM=y
#enable MPU
CONFIG_STM32_ARM_MPU_ENABLE=y
CONFIG_ARM_MPU=y

2
boards/arm/olimex_stm32_e407/olimex_stm32_e407_defconfig
View file

@ -7,7 +7,7 @@ CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=168000000
CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
# Enable MPU
CONFIG_STM32_ARM_MPU_ENABLE=y
CONFIG_ARM_MPU=y
CONFIG_SERIAL=y

2
boards/arm/olimex_stm32_h407/olimex_stm32_h407_defconfig
View file

@ -7,7 +7,7 @@ CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=168000000
CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
# Enable MPU
CONFIG_STM32_ARM_MPU_ENABLE=y
CONFIG_ARM_MPU=y
CONFIG_SERIAL=y

2
boards/arm/olimex_stm32_p405/olimex_stm32_p405_defconfig
View file

@ -7,7 +7,7 @@ CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=168000000
CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
# Enable MPU
CONFIG_STM32_ARM_MPU_ENABLE=y
CONFIG_ARM_MPU=y
CONFIG_SERIAL=y

2
boards/arm/stm32f411e_disco/stm32f411e_disco_defconfig
View file

@ -7,7 +7,7 @@ CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=100000000
CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
# Enable MPU
CONFIG_STM32_ARM_MPU_ENABLE=y
CONFIG_ARM_MPU=y
# Serial Drivers
CONFIG_SERIAL=y

2
boards/arm/stm32f412g_disco/stm32f412g_disco_defconfig
View file

@ -7,7 +7,7 @@ CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=100000000
CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
# Enable MPU
CONFIG_STM32_ARM_MPU_ENABLE=y
CONFIG_ARM_MPU=y
CONFIG_SERIAL=y

2
boards/arm/stm32f429i_disc1/stm32f429i_disc1_defconfig
View file

@ -7,7 +7,7 @@ CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=168000000
CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
# Enable MPU
CONFIG_STM32_ARM_MPU_ENABLE=y
CONFIG_ARM_MPU=y
CONFIG_SERIAL=y

2
boards/arm/stm32f469i_disco/stm32f469i_disco_defconfig
View file

@ -7,7 +7,7 @@ CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=180000000
CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
# Enable MPU
CONFIG_STM32_ARM_MPU_ENABLE=y
CONFIG_ARM_MPU=y
CONFIG_SERIAL=y

2
boards/arm/stm32f4_disco/stm32f4_disco_defconfig
View file

@ -7,7 +7,7 @@ CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=168000000
CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
# Enable MPU
CONFIG_STM32_ARM_MPU_ENABLE=y
CONFIG_ARM_MPU=y
CONFIG_SERIAL=y

7
soc/arm/st_stm32/Kconfig
View file

@ -18,13 +18,6 @@ config SOC_FAMILY
string
default "st_stm32"
config STM32_ARM_MPU_ENABLE
bool "Enable MPU on STM32"
depends on CPU_HAS_MPU
select ARM_MPU
help
Enable MPU support on STM32 SoCs
source "soc/arm/st_stm32/*/Kconfig.soc"
endif # SOC_FAMILY_STM32

2
soc/arm/st_stm32/common/CMakeLists.txt
View file

@ -1,2 +1,2 @@
zephyr_sources_ifdef(CONFIG_STM32_ARM_MPU_ENABLE arm_mpu_regions.c)
zephyr_sources_ifdef(CONFIG_ARM_MPU arm_mpu_regions.c)
zephyr_sources(stm32cube_hal.c)