[PATCH 6/8] tegra: don't force to choose between Tegra arches

[Lucas Stach]

There is nothing technically preventing a single Tegra 20/30
image to be built. Don't force this split in Kconfig.

Signed-off-by: Lucas Stach <dev at lynxeye.de>
---
 arch/arm/mach-tegra/Kconfig | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 4164f56..90c0c0f 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -5,15 +5,6 @@ config ARCH_TEXT_BASE
 	default 0x0
 
 choice
-	prompt "Tegra processor type"
-
-config ARCH_TEGRA_2x_SOC
-	bool "Tegra 20"
-	select PINCTRL_TEGRA20
-
-endchoice
-
-choice
 	prompt "Tegra debug UART"
 	help
 	  This is the first serial console that gets activated by barebox.
@@ -48,18 +39,22 @@ endchoice
 
 # ---------------------------------------------------------
 
-if ARCH_TEGRA_2x_SOC
+config ARCH_TEGRA_2x_SOC
+	bool
+	select PINCTRL_TEGRA20
 
 choice
-	prompt "Tegra 20 Board Type"
+	prompt "select Tegra Board"
 
 config MACH_TEGRA20_GENERIC
 	bool "Generic DT based board"
+	select ARCH_TEGRA_2x_SOC
 	help
 	  Say Y here if you are building for a generic DT based board.
 
 config MACH_TOSHIBA_AC100
 	bool "Toshiba AC100"
+	select ARCH_TEGRA_2x_SOC
 	help
 	  Say Y here if you are using Toshiba AC100 smartbook.
 
@@ -71,8 +66,6 @@ endif #MACH_TEGRA20_GENERIC
 
 source arch/arm/boards/toshiba-ac100/Kconfig
 
-endif #ARCH_TEGRA_2x_SOC
-
 # ---------------------------------------------------------
 
 endif
-- 
1.8.3.1