arch: stm32: Remove STM32_ARM_MPU_ENABLE option.

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>
zephyrproject-rtos · Sep 20, 2018 · eb1ee5f · eb1ee5f
1 parent 461a9de
commit eb1ee5f
Show file tree

Hide file tree

Showing 19 changed files with 18 additions and 25 deletions.
diff --git a/boards/arm/96b_carbon/96b_carbon_defconfig b/boards/arm/96b_carbon/96b_carbon_defconfig
@@ -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
 

diff --git a/boards/arm/disco_l475_iot1/disco_l475_iot1_defconfig b/boards/arm/disco_l475_iot1/disco_l475_iot1_defconfig
@@ -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

diff --git a/boards/arm/nucleo_f401re/nucleo_f401re_defconfig b/boards/arm/nucleo_f401re/nucleo_f401re_defconfig
@@ -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
 

diff --git a/boards/arm/nucleo_f411re/nucleo_f411re_defconfig b/boards/arm/nucleo_f411re/nucleo_f411re_defconfig
@@ -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
 

diff --git a/boards/arm/nucleo_f412zg/nucleo_f412zg_defconfig b/boards/arm/nucleo_f412zg/nucleo_f412zg_defconfig
@@ -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
 

diff --git a/boards/arm/nucleo_f413zh/nucleo_f413zh_defconfig b/boards/arm/nucleo_f413zh/nucleo_f413zh_defconfig
@@ -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
 

diff --git a/boards/arm/nucleo_f429zi/nucleo_f429zi_defconfig b/boards/arm/nucleo_f429zi/nucleo_f429zi_defconfig
@@ -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
 

diff --git a/boards/arm/nucleo_f446re/nucleo_f446re_defconfig b/boards/arm/nucleo_f446re/nucleo_f446re_defconfig
@@ -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
 

diff --git a/boards/arm/nucleo_l476rg/nucleo_l476rg_defconfig b/boards/arm/nucleo_l476rg/nucleo_l476rg_defconfig
@@ -38,4 +38,4 @@ CONFIG_UART_CONSOLE=y
 CONFIG_PWM=y
 
 #enable MPU
-CONFIG_STM32_ARM_MPU_ENABLE=y
+CONFIG_ARM_MPU=y
diff --git a/boards/arm/olimex_stm32_e407/olimex_stm32_e407_defconfig b/boards/arm/olimex_stm32_e407/olimex_stm32_e407_defconfig
@@ -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
 

diff --git a/boards/arm/olimex_stm32_h407/olimex_stm32_h407_defconfig b/boards/arm/olimex_stm32_h407/olimex_stm32_h407_defconfig
@@ -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
 

diff --git a/boards/arm/olimex_stm32_p405/olimex_stm32_p405_defconfig b/boards/arm/olimex_stm32_p405/olimex_stm32_p405_defconfig
@@ -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
 

diff --git a/boards/arm/stm32f411e_disco/stm32f411e_disco_defconfig b/boards/arm/stm32f411e_disco/stm32f411e_disco_defconfig
@@ -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

diff --git a/boards/arm/stm32f412g_disco/stm32f412g_disco_defconfig b/boards/arm/stm32f412g_disco/stm32f412g_disco_defconfig
@@ -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
 

diff --git a/boards/arm/stm32f429i_disc1/stm32f429i_disc1_defconfig b/boards/arm/stm32f429i_disc1/stm32f429i_disc1_defconfig
@@ -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
 

diff --git a/boards/arm/stm32f469i_disco/stm32f469i_disco_defconfig b/boards/arm/stm32f469i_disco/stm32f469i_disco_defconfig
@@ -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
 

diff --git a/boards/arm/stm32f4_disco/stm32f4_disco_defconfig b/boards/arm/stm32f4_disco/stm32f4_disco_defconfig
@@ -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
 

diff --git a/soc/arm/st_stm32/Kconfig b/soc/arm/st_stm32/Kconfig
@@ -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
diff --git a/soc/arm/st_stm32/common/CMakeLists.txt b/soc/arm/st_stm32/common/CMakeLists.txt
@@ -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)