diff --git a/boards/arm/96b_carbon/96b_carbon_defconfig b/boards/arm/96b_carbon/96b_carbon_defconfig index 466aaf09c38..0b3992b3316 100644 --- 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 index 55042f7a207..047e4bf6746 100644 --- 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 index 1914c1b058d..0e3d7381841 100644 --- 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 index b8296d554e7..cdfbd77a312 100644 --- 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 index 84b761ef741..780d6ff6175 100644 --- 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 index 5ac6fb1d3eb..afcf6d493d7 100644 --- 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 index fa382a8fae9..ffa80ec5cfe 100644 --- 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 index 8ed2b70bfff..c2033137484 100644 --- 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 index 955370e4124..579a8915df4 100644 --- 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 index e61265327bb..a3eee0c01f7 100644 --- 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 index a61ddb20a38..6788257e56f 100644 --- 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 index 11166dd5aba..99901097521 100644 --- 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 index f7d086e291a..b672efe5d5b 100644 --- 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 index 32da285f650..a9ba8696601 100644 --- 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 index e6608108b2e..f79a106cb47 100644 --- 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 index f75673a37ca..8981ad58098 100644 --- 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 index 8e7ce9ad68b..56db738a4a2 100644 --- 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 index 4f4e25f687c..dc14303fea5 100644 --- 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 index 1351b498e20..ab30333fba2 100644 --- 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)