From 1dadfaa3b465dc332fa4512f88c6f6535d542acf Mon Sep 17 00:00:00 2001 From: Michel Jaouen Date: Fri, 9 Jun 2017 17:18:09 +0200 Subject: [PATCH] arm: soc: stm32: make mpu f4 config useable for other family As other stm32 series support MPU, move common file in a file tree useable by socs from other series JIRA: ZEP-2220 Signed-off-by: Michel Jaouen --- arch/arm/soc/st_stm32/Kbuild | 1 + arch/arm/soc/st_stm32/Kconfig | 8 ++++++++ arch/arm/soc/st_stm32/common/Makefile | 1 + .../soc/st_stm32/{stm32f4 => common}/arm_mpu_mem_cfg.h | 0 .../soc/st_stm32/{stm32f4 => common}/arm_mpu_regions.c | 0 arch/arm/soc/st_stm32/stm32f4/Kconfig.soc | 7 ------- arch/arm/soc/st_stm32/stm32f4/Makefile | 1 - 7 files changed, 10 insertions(+), 8 deletions(-) create mode 100644 arch/arm/soc/st_stm32/common/Makefile rename arch/arm/soc/st_stm32/{stm32f4 => common}/arm_mpu_mem_cfg.h (100%) rename arch/arm/soc/st_stm32/{stm32f4 => common}/arm_mpu_regions.c (100%) 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)