Merge branch 'etnaviv/fixes' of https://git.pengutronix.de/git/lst/linux into drm...

[sfrench/cifs-2.6.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 4c6816be23a923ac1ad23b7769851da3f2f2bb5e..4c1a35f1583872d2ce39db5c1cacce28be48ccb1 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -359,15 +359,6 @@ config ARM_SINGLE_ARMV7M
        select SPARSE_IRQ
        select USE_OF
 
-config ARCH_GEMINI
-       bool "Cortina Systems Gemini"
-       select CLKSRC_MMIO
-       select CPU_FA526
-       select GENERIC_CLOCKEVENTS
-       select GPIOLIB
-       help
-         Support for the Cortina Systems Gemini family SoCs
-
 config ARCH_EBSA110
        bool "EBSA-110"
        select ARCH_USES_GETTIMEOFFSET
@@ -819,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"
@@ -877,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