diff options
| author | Ludovic Barre <ludovic.barre@st.com> | 2018-02-27 11:05:18 +0300 |
|---|---|---|
| committer | Alexandre Torgue <alexandre.torgue@st.com> | 2018-03-05 11:08:35 +0300 |
| commit | 3ed71f8ad98a07803299693481b03fa6391e094f (patch) | |
| tree | f310ef918046eb6a163f96654d0cfb04c3de750e /arch/arm/mach-stm32 | |
| parent | 40fed8d0e3833200f4b9f7cd057e37d0450a5044 (diff) | |
| download | linux-3ed71f8ad98a07803299693481b03fa6391e094f.tar.xz | |
ARM: stm32: prepare stm32 family to welcome armv7 architecture
This patch prepares the STM32 machine for the integration of Cortex-A
based microprocessor (MPU), on top of the existing Cortex-M
microcontroller family (MCU). Since both MCUs and MPUs are sharing
common hardware blocks we can keep using ARCH_STM32 flag for most of
them. If a hardware block is specific to one family we can use either
ARM_SINGLE_ARMV7M or ARCH_MULTI_V7 flag.
Signed-off-by: Ludovic Barre <ludovic.barre@st.com>
Signed-off-by: Alexandre Torgue <alexandre.torgue@st.com>
Diffstat (limited to 'arch/arm/mach-stm32')
| -rw-r--r-- | arch/arm/mach-stm32/Kconfig | 28 | ||||
| -rw-r--r-- | arch/arm/mach-stm32/board-dt.c | 2 |
2 files changed, 15 insertions, 15 deletions
diff --git a/arch/arm/mach-stm32/Kconfig b/arch/arm/mach-stm32/Kconfig index 33b07db3755d..1a876460c74d 100644 --- a/arch/arm/mach-stm32/Kconfig +++ b/arch/arm/mach-stm32/Kconfig @@ -1,8 +1,7 @@ -config ARCH_STM32 - bool "STMicrolectronics STM32" - depends on ARM_SINGLE_ARMV7M +menuconfig ARCH_STM32 + bool "STMicroelectronics STM32 family" if ARM_SINGLE_ARMV7M || ARCH_MULTI_V7 + select ARMV7M_SYSTICK if ARM_SINGLE_ARMV7M select ARCH_HAS_RESET_CONTROLLER - select ARMV7M_SYSTICK select CLKSRC_STM32 select PINCTRL select RESET_CONTROLLER @@ -10,27 +9,30 @@ config ARCH_STM32 help Support for STMicroelectronics STM32 processors. +if ARCH_STM32 + +if ARM_SINGLE_ARMV7M + config MACH_STM32F429 - bool "STMicrolectronics STM32F429" - depends on ARCH_STM32 + bool "STMicroelectronics STM32F429" default y config MACH_STM32F469 - bool "STMicrolectronics STM32F469" - depends on ARCH_STM32 + bool "STMicroelectronics STM32F469" default y config MACH_STM32F746 - bool "STMicrolectronics STM32F746" - depends on ARCH_STM32 + bool "STMicroelectronics STM32F746" default y config MACH_STM32F769 bool "STMicroelectronics STM32F769" - depends on ARCH_STM32 default y config MACH_STM32H743 - bool "STMicrolectronics STM32H743" - depends on ARCH_STM32 + bool "STMicroelectronics STM32H743" default y + +endif # ARMv7-M + +endif diff --git a/arch/arm/mach-stm32/board-dt.c b/arch/arm/mach-stm32/board-dt.c index 8c682f4a8ffc..6786f357851f 100644 --- a/arch/arm/mach-stm32/board-dt.c +++ b/arch/arm/mach-stm32/board-dt.c @@ -6,7 +6,6 @@ */ #include <linux/kernel.h> -#include <asm/v7m.h> #include <asm/mach/arch.h> static const char *const stm32_compat[] __initconst = { @@ -20,5 +19,4 @@ static const char *const stm32_compat[] __initconst = { DT_MACHINE_START(STM32DT, "STM32 (Device Tree Support)") .dt_compat = stm32_compat, - .restart = armv7m_restart, MACHINE_END |