Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753927AbdLHOML (ORCPT ); Fri, 8 Dec 2017 09:12:11 -0500 Received: from mx08-00178001.pphosted.com ([91.207.212.93]:55355 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753699AbdLHOMJ (ORCPT ); Fri, 8 Dec 2017 09:12:09 -0500 From: Ludovic Barre To: Russell King , Rob Herring , Linus Walleij , Arnd Bergmann CC: Maxime Coquelin , Alexandre Torgue , , , , Ludovic Barre Subject: [PATCH 1/6] ARM: stm32: prepare stm32 family to welcome armv7 architecture Date: Fri, 8 Dec 2017 15:11:12 +0100 Message-ID: <1512742277-28205-2-git-send-email-ludovic.Barre@st.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1512742277-28205-1-git-send-email-ludovic.Barre@st.com> References: <1512742277-28205-1-git-send-email-ludovic.Barre@st.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.48.0.237] X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-12-08_08:,, signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4230 Lines: 134 From: Ludovic Barre 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 ARCH_STM32_MCU or ARCH_STM32_MPU flag. Signed-off-by: Ludovic Barre --- Documentation/arm/stm32/overview.txt | 21 +++++++-------- arch/arm/mach-stm32/Kconfig | 30 +++++++++++++++------- arch/arm/mach-stm32/Makefile | 2 +- arch/arm/mach-stm32/{board-dt.c => board-mcu-dt.c} | 0 4 files changed, 33 insertions(+), 20 deletions(-) rename arch/arm/mach-stm32/{board-dt.c => board-mcu-dt.c} (100%) diff --git a/Documentation/arm/stm32/overview.txt b/Documentation/arm/stm32/overview.txt index a03b035..384cc7f 100644 --- a/Documentation/arm/stm32/overview.txt +++ b/Documentation/arm/stm32/overview.txt @@ -4,17 +4,17 @@ Introduction ------------ - The STMicroelectronics family of Cortex-M based MCUs are supported by the - 'STM32' platform of ARM Linux. Currently only the STM32F429 (Cortex-M4) - and STM32F746 (Cortex-M7) are supported. - + The STMicroelectronics STM32 family of Cortex-A microprocessors (MPUs) and + Cortex-M microcontrollers (MCUs) are supported by the 'STM32' platform of + ARM Linux. Configuration ------------- - A generic configuration is provided for STM32 family, and can be used as the - default by + For MCUs, use the provided default configuration: make stm32_defconfig + For MPUs, use multi_v7 configuration: + make multi_v7_defconfig Layout ------ @@ -22,12 +22,13 @@ Layout All the files for multiple machine families are located in the platform code contained in arch/arm/mach-stm32 - There is a generic board board-dt.c in the mach folder which support - Flattened Device Tree, which means, it works with any compatible board with - Device Trees. - + There are generic boards board-mcu-dt.c and board-mpu-dt.c files in the mach + folder which support Flattened Device Tree, which means, they work with any + compatible board with Device Trees. Document Author --------------- Maxime Coquelin + Ludovic Barre + Gerald Baeza diff --git a/arch/arm/mach-stm32/Kconfig b/arch/arm/mach-stm32/Kconfig index 0d1889b..c8059ea 100644 --- a/arch/arm/mach-stm32/Kconfig +++ b/arch/arm/mach-stm32/Kconfig @@ -1,31 +1,43 @@ -config ARCH_STM32 - bool "STMicrolectronics STM32" - depends on ARM_SINGLE_ARMV7M +menuconfig ARCH_STM32 + bool "STMicrolectronics STM32 family" if ARM_SINGLE_ARMV7M select ARCH_HAS_RESET_CONTROLLER - select ARMV7M_SYSTICK select CLKSRC_STM32 select PINCTRL select RESET_CONTROLLER select STM32_EXTI help - Support for STMicroelectronics STM32 processors. + Support for STMicroelectronics STM32 MCU family + +if ARCH_STM32 + +if ARM_SINGLE_ARMV7M + +config ARCH_STM32_MCU + bool "STMicrolectronics STM32 MCU" + select ARMV7M_SYSTICK + help + Support for STMicroelectronics STM32 Microcontrollers. config MACH_STM32F429 bool "STMicrolectronics STM32F429" - depends on ARCH_STM32 + depends on ARCH_STM32_MCU default y config MACH_STM32F469 bool "STMicrolectronics STM32F469" - depends on ARCH_STM32 + depends on ARCH_STM32_MCU default y config MACH_STM32F746 bool "STMicrolectronics STM32F746" - depends on ARCH_STM32 + depends on ARCH_STM32_MCU default y config MACH_STM32H743 bool "STMicrolectronics STM32H743" - depends on ARCH_STM32 + depends on ARCH_STM32_MCU default y + +endif + +endif diff --git a/arch/arm/mach-stm32/Makefile b/arch/arm/mach-stm32/Makefile index bd0b7b5..90c1b71 100644 --- a/arch/arm/mach-stm32/Makefile +++ b/arch/arm/mach-stm32/Makefile @@ -1 +1 @@ -obj-y += board-dt.o +obj-$(CONFIG_ARCH_STM32_MCU) += board-mcu-dt.o diff --git a/arch/arm/mach-stm32/board-dt.c b/arch/arm/mach-stm32/board-mcu-dt.c similarity index 100% rename from arch/arm/mach-stm32/board-dt.c rename to arch/arm/mach-stm32/board-mcu-dt.c -- 2.7.4