diff options
| author | Olof Johansson <olof@lixom.net> | 2017-04-19 05:23:33 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-04-19 05:23:33 -0700 |
| commit | f0008e9b6c57cfd302465d509232937ae809decb (patch) | |
| tree | e58d2482c6a686f086a41f40c45831f638439832 /arch/arm/Kconfig | |
| parent | b69bad75a840c0c51b1898320dc8e8b829e5322a (diff) | |
| parent | c6ed0f31ce3e1c5729d1c8f81a2a94ab881506a6 (diff) | |
| download | blackbird-obmc-linux-f0008e9b6c57cfd302465d509232937ae809decb.tar.gz blackbird-obmc-linux-f0008e9b6c57cfd302465d509232937ae809decb.zip | |
Merge tag 'stm32-soc-for-v4.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into next/soc
STM32 SOC updates for v4.12, round 1.
Highlights:
----------
- Create a dedicated Kconfig for STM32 machine
- Add support of STM32H743 MCU
* tag 'stm32-soc-for-v4.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32:
ARM: stm32: Add a new SOC - STM32H743
ARM: stm32: Introduce MACH_STM32H743 flag
ARM: stm32: create dedicated kconfig for STM32 machine
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f1e83a7ffdae..93ee674c2793 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -810,6 +810,8 @@ source "arch/arm/mach-spear/Kconfig" source "arch/arm/mach-sti/Kconfig" +source "arch/arm/mach-stm32/Kconfig" + source "arch/arm/mach-s3c24xx/Kconfig" source "arch/arm/mach-s3c64xx/Kconfig" @@ -868,28 +870,6 @@ config ARCH_LPC18XX Support for NXP's LPC18xx Cortex-M3 and LPC43xx Cortex-M4 high performance microcontrollers. -config ARCH_STM32 - bool "STMicrolectronics STM32" - depends on 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. - -config MACH_STM32F429 - bool "STMicrolectronics STM32F429" - depends on ARCH_STM32 - default y - -config MACH_STM32F746 - bool "STMicrolectronics STM32F746" - depends on ARCH_STM32 - default y - config ARCH_MPS2 bool "ARM MPS2 platform" depends on ARM_SINGLE_ARMV7M |
