Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b6effb6 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
parent d42799b7

arch/arm/mach-spear13xx/Kconfig

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
#

# 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

arch/arm/mach-spear3xx/Kconfig

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
#

# 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

arch/arm/mach-spear6xx/Kconfig

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
#

# 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

arch/arm/plat-spear/Kconfig

+47 −4
Original line number Diff line number Diff line
@@ -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