ARM: spear: merge Kconfig files

As a preparation to merging the spear platforms into one directory, this
merges the four Kconfig files into one.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>

diff --git a/arch/arm/mach-spear13xx/Kconfig b/arch/arm/mach-spear13xx/Kconfig
deleted file mode 100644 (file)
index eaadc66..0000000
--- a/arch/arm/mach-spear13xx/Kconfig
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# SPEAr13XX Machine configuration file
-#
-
-if ARCH_SPEAR13XX
-
-menu "SPEAr13xx Implementations"
-config MACH_SPEAR1310
-       bool "SPEAr1310 Machine support with Device Tree"
-       select PINCTRL_SPEAR1310
-       help
-         Supports ST SPEAr1310 machine configured via the device-tree
-
-config MACH_SPEAR1340
-       bool "SPEAr1340 Machine support with Device Tree"
-       select PINCTRL_SPEAR1340
-       help
-         Supports ST SPEAr1340 machine configured via the device-tree
-endmenu
-endif #ARCH_SPEAR13XX

diff --git a/arch/arm/mach-spear3xx/Kconfig b/arch/arm/mach-spear3xx/Kconfig
deleted file mode 100644 (file)
index 8bd3729..0000000
--- a/arch/arm/mach-spear3xx/Kconfig
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# SPEAr3XX Machine configuration file
-#
-
-if ARCH_SPEAR3XX
-
-menu "SPEAr3xx Implementations"
-config MACH_SPEAR300
-       bool "SPEAr300 Machine support with Device Tree"
-       select PINCTRL_SPEAR300
-       help
-         Supports ST SPEAr300 machine configured via the device-tree
-
-config MACH_SPEAR310
-       bool "SPEAr310 Machine support with Device Tree"
-       select PINCTRL_SPEAR310
-       help
-         Supports ST SPEAr310 machine configured via the device-tree
-
-config MACH_SPEAR320
-       bool "SPEAr320 Machine support with Device Tree"
-       select PINCTRL_SPEAR320
-       help
-         Supports ST SPEAr320 machine configured via the device-tree
-endmenu
-endif #ARCH_SPEAR3XX

diff --git a/arch/arm/mach-spear6xx/Kconfig b/arch/arm/mach-spear6xx/Kconfig
deleted file mode 100644 (file)
index 339f397..0000000
--- a/arch/arm/mach-spear6xx/Kconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# SPEAr6XX Machine configuration file
-#
-
-config MACH_SPEAR600
-       def_bool y
-       depends on ARCH_SPEAR6XX
-       select USE_OF
-       help
-         Supports ST SPEAr600 boards configured via the device-tree

diff --git a/arch/arm/plat-spear/Kconfig b/arch/arm/plat-spear/Kconfig
index 739d016eb273faf8a22859856767901ce7e8beef..e288df90c7465c801706200629b0e41c87c307ec 100644 (file)
--- a/arch/arm/plat-spear/Kconfig
+++ b/arch/arm/plat-spear/Kconfig
@@ -39,9 +39,52 @@ config ARCH_SPEAR6XX
 
 endchoice
 
-# Adding SPEAr machine specific configuration files
-source "arch/arm/mach-spear13xx/Kconfig"
-source "arch/arm/mach-spear3xx/Kconfig"
-source "arch/arm/mach-spear6xx/Kconfig"
+if ARCH_SPEAR13XX
+
+menu "SPEAr13xx Implementations"
+config MACH_SPEAR1310
+       bool "SPEAr1310 Machine support with Device Tree"
+       select PINCTRL_SPEAR1310
+       help
+         Supports ST SPEAr1310 machine configured via the device-tree
+
+config MACH_SPEAR1340
+       bool "SPEAr1340 Machine support with Device Tree"
+       select PINCTRL_SPEAR1340
+       help
+         Supports ST SPEAr1340 machine configured via the device-tree
+endmenu
+endif #ARCH_SPEAR13XX
+
+if ARCH_SPEAR3XX
+
+menu "SPEAr3xx Implementations"
+config MACH_SPEAR300
+       bool "SPEAr300 Machine support with Device Tree"
+       select PINCTRL_SPEAR300
+       help
+         Supports ST SPEAr300 machine configured via the device-tree
+
+config MACH_SPEAR310
+       bool "SPEAr310 Machine support with Device Tree"
+       select PINCTRL_SPEAR310
+       help
+         Supports ST SPEAr310 machine configured via the device-tree
+
+config MACH_SPEAR320
+       bool "SPEAr320 Machine support with Device Tree"
+       select PINCTRL_SPEAR320
+       help
+         Supports ST SPEAr320 machine configured via the device-tree
+endmenu
+
+endif
+
+config MACH_SPEAR600
+       def_bool y
+       depends on ARCH_SPEAR6XX
+       select USE_OF
+       help
+         Supports ST SPEAr600 boards configured via the device-treesource "arch/arm/mach-spear6xx/Kconfig"
 
 endif