summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorScott Williams <scwilliams@nvidia.com>2011-06-09 11:41:18 -0700
committerNiket Sirsi <nsirsi@nvidia.com>2011-06-20 13:52:28 -0700
commit952412ded4551b8f58873f36a16d99a895d8349b (patch)
treec6dc1a9e6a9eb53834b8b8ab421851e02d779d0c /arch
parent694210aea04a46e3611d2867c12d00dfeffae1e7 (diff)
ARM: tegra: Change SOC selecton from choice to simple Boolean
Change-Id: I0c19d71935a2c84ab51c0e2dcb5277670e1f96f8 Reviewed-on: http://git-master/r/35926 Tested-by: Scott Williams <scwilliams@nvidia.com> Reviewed-by: Scott Williams <scwilliams@nvidia.com> Reviewed-by: Mark Stadler <mastadler@nvidia.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-tegra/Kconfig11
1 files changed, 4 insertions, 7 deletions
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 6884fe061c84..7aa2fe852c45 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -2,11 +2,10 @@ if ARCH_TEGRA
comment "NVIDIA Tegra options"
-choice
- prompt "Select Tegra processor family for target system"
-
config ARCH_TEGRA_2x_SOC
- bool "Tegra 2 family"
+ bool "Tegra 2 family SOC"
+ default y
+ depends on !ARCH_TEGRA_3x_SOC
select CPU_V7
select ARM_GIC
select ARCH_REQUIRE_GPIOLIB
@@ -19,7 +18,7 @@ config ARCH_TEGRA_2x_SOC
ARM CortexA9MP CPU and the ARM PL310 L2 cache controller
config ARCH_TEGRA_3x_SOC
- bool "Tegra 3 family"
+ bool "Tegra 3 family SOC"
select CPU_V7
select ARM_GIC
select ARCH_REQUIRE_GPIOLIB
@@ -32,8 +31,6 @@ config ARCH_TEGRA_3x_SOC
Support for NVIDIA Tegra 3 family of SoCs, based upon the
ARM CortexA9MP CPU and the ARM PL310 L2 cache controller
-endchoice
-
comment "Tegra board type"
config MACH_HARMONY