diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2012-12-02 14:51:55 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-03-12 17:39:36 +0100 |
| commit | 4b6effb6ff38aab60d224cefba76b016552f8bf8 (patch) | |
| tree | 176c300163c884c5390a188c2c29d6bba66f30a4 /arch/arm/plat-spear | |
| parent | ARM: spear: make spear3xx/6xx mach/spear.h files identical (diff) | |
| download | linux-dev-4b6effb6ff38aab60d224cefba76b016552f8bf8.tar.xz linux-dev-4b6effb6ff38aab60d224cefba76b016552f8bf8.zip | |
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>
Diffstat (limited to 'arch/arm/plat-spear')
| -rw-r--r-- | arch/arm/plat-spear/Kconfig | 51 |
1 files changed, 47 insertions, 4 deletions
diff --git a/arch/arm/plat-spear/Kconfig b/arch/arm/plat-spear/Kconfig index 739d016eb273..e288df90c746 100644 --- 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 |