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

Commit 558d774a authored by Ryan Mallon's avatar Ryan Mallon Committed by Russell King
Browse files

ARM: 6931/1: SPEAr3xx: Rework KConfig to allow all boards to be compiled in 



Now that all three SPEAr3xx platforms can be built into one kernel,
rework KConfig to allow this. Move everything into one KConfig file
while we are here.

Reviewed-by: default avatarStanley Miao <stanley.miao@windriver.com>
Signed-off-by: default avatarRyan Mallon <ryan@bluewatersys.com>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@st.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 1d23d2fc

arch/arm/mach-spear3xx/Kconfig

+20 −10
Original line number Diff line number Diff line
@@ -4,9 +4,26 @@ 


if ARCH_SPEAR3XX



choice

	prompt "SPEAr3XX Family"

	default MACH_SPEAR300

menu "SPEAr3xx Implementations"

config BOARD_SPEAR300_EVB

	bool "SPEAr300 Evaluation Board"

	select MACH_SPEAR300

	help

	  Supports ST SPEAr300 Evaluation Board



config BOARD_SPEAR310_EVB

	bool "SPEAr310 Evaluation Board"

	select MACH_SPEAR310

	help

	  Supports ST SPEAr310 Evaluation Board



config BOARD_SPEAR320_EVB

	bool "SPEAr320 Evaluation Board"

	select MACH_SPEAR320

	help

	  Supports ST SPEAr320 Evaluation Board



endmenu



config MACH_SPEAR300

	bool "SPEAr300"
@@ -23,11 +40,4 @@ config MACH_SPEAR320 
	help

	  Supports ST SPEAr320 Machine



endchoice



# Adding SPEAr3XX machine specific configuration files

source "arch/arm/mach-spear3xx/Kconfig300"

source "arch/arm/mach-spear3xx/Kconfig310"

source "arch/arm/mach-spear3xx/Kconfig320"



endif #ARCH_SPEAR3XX

arch/arm/mach-spear3xx/Kconfig300

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

# SPEAr300 machine configuration file

#



if MACH_SPEAR300



choice

	prompt "SPEAr300 Boards"

	default BOARD_SPEAR300_EVB



config BOARD_SPEAR300_EVB

	bool "SPEAr300 Evaluation Board"

	help

	  Supports ST SPEAr300 Evaluation Board

endchoice



endif	#MACH_SPEAR300

arch/arm/mach-spear3xx/Kconfig310

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

# SPEAr310 machine configuration file

#



if MACH_SPEAR310



choice

	prompt "SPEAr310 Boards"

	default BOARD_SPEAR310_EVB



config BOARD_SPEAR310_EVB

	bool "SPEAr310 Evaluation Board"

	help

	  Supports ST SPEAr310 Evaluation Board

endchoice



endif	#MACH_SPEAR310

arch/arm/mach-spear3xx/Kconfig320

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

# SPEAr320 machine configuration file

#



if MACH_SPEAR320



choice

	prompt "SPEAr320 Boards"

	default BOARD_SPEAR320_EVB



config BOARD_SPEAR320_EVB

	bool "SPEAr320 Evaluation Board"

	help

	  Supports ST SPEAr320 Evaluation Board

endchoice



endif	#MACH_SPEAR320