diff --git a/arch/arm/soc/st_stm32/Kbuild b/arch/arm/soc/st_stm32/Kbuild index f3eed19aafd..58264e36bf2 100644 --- a/arch/arm/soc/st_stm32/Kbuild +++ b/arch/arm/soc/st_stm32/Kbuild @@ -1,2 +1,3 @@ obj-y += $(SOC_SERIES)/ +obj-y += common/ diff --git a/arch/arm/soc/st_stm32/Kconfig b/arch/arm/soc/st_stm32/Kconfig index 62fa8c1d38d..2f1969af78d 100644 --- a/arch/arm/soc/st_stm32/Kconfig +++ b/arch/arm/soc/st_stm32/Kconfig @@ -16,4 +16,12 @@ config SOC_FAMILY default st_stm32 endif +config STM32_ARM_MPU_ENABLE + bool "Enable MPU" + depends on CPU_HAS_MPU + select ARM_MPU + default n + help + Enable MPU + source "arch/arm/soc/st_stm32/*/Kconfig.soc" diff --git a/arch/arm/soc/st_stm32/common/Makefile b/arch/arm/soc/st_stm32/common/Makefile new file mode 100644 index 00000000000..65e8a46364f --- /dev/null +++ b/arch/arm/soc/st_stm32/common/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_STM32_ARM_MPU_ENABLE) += arm_mpu_regions.o diff --git a/arch/arm/soc/st_stm32/stm32f4/arm_mpu_mem_cfg.h b/arch/arm/soc/st_stm32/common/arm_mpu_mem_cfg.h similarity index 100% rename from arch/arm/soc/st_stm32/stm32f4/arm_mpu_mem_cfg.h rename to arch/arm/soc/st_stm32/common/arm_mpu_mem_cfg.h diff --git a/arch/arm/soc/st_stm32/stm32f4/arm_mpu_regions.c b/arch/arm/soc/st_stm32/common/arm_mpu_regions.c similarity index 100% rename from arch/arm/soc/st_stm32/stm32f4/arm_mpu_regions.c rename to arch/arm/soc/st_stm32/common/arm_mpu_regions.c diff --git a/arch/arm/soc/st_stm32/stm32f4/Kconfig.soc b/arch/arm/soc/st_stm32/stm32f4/Kconfig.soc index 11b412cd2b1..9043383ce6e 100644 --- a/arch/arm/soc/st_stm32/stm32f4/Kconfig.soc +++ b/arch/arm/soc/st_stm32/stm32f4/Kconfig.soc @@ -32,13 +32,6 @@ config SOC_STM32F469XI endchoice -config STM32_ARM_MPU_ENABLE - bool "Enable MPU" - depends on CPU_HAS_MPU - select ARM_MPU - default n - help - Enable MPU choice prompt "Configure Bootloader Options" diff --git a/arch/arm/soc/st_stm32/stm32f4/Makefile b/arch/arm/soc/st_stm32/stm32f4/Makefile index 218b68294b5..6ae6e190c48 100644 --- a/arch/arm/soc/st_stm32/stm32f4/Makefile +++ b/arch/arm/soc/st_stm32/stm32f4/Makefile @@ -2,7 +2,6 @@ obj-y += soc.o obj-$(CONFIG_GPIO) += soc_gpio.o obj-$(CONFIG_PINMUX) += soc_pinmux.o -obj-$(CONFIG_STM32_ARM_MPU_ENABLE) += arm_mpu_regions.o zephyr: $(KERNEL_HEX_NAME) all: $(KERNEL_HEX_NAME)