diff options
| author | Gary King <gking@nvidia.com> | 2010-05-28 11:09:48 -0700 |
|---|---|---|
| committer | Gary King <gking@nvidia.com> | 2010-05-28 11:26:17 -0700 |
| commit | 8081341e6b02ac5e52bc6859db92aa1495f67161 (patch) | |
| tree | 413398f60b30c3ff80c40f7ede949f4061f16cb9 /arch | |
| parent | a0d06d69c65f7578f3dfeae0a22a780184e855d7 (diff) | |
[ARM/tegra] clean up tegra Kconfigs
MACH_HARMONY is no longer used now that Whistler, Harmony and Tango will
use the same top-level board-generic.c machine file; delete it and move
MACH_TEGRA_GENERIC into its place.
introduce TEGRA_ODM_KIT as a selected Kconfig for machines which implement
ODM kits; this is mandatory for a machine to run with the NvRm drivers,
but basic system bringup (serial console and RAM disk) should be possible
without this
Change-Id: Id954aa6ba1fea6623f0b8e75fa8b25e4333f852f
Reviewed-on: http://git-master/r/1808
Reviewed-by: Gary King <gking@nvidia.com>
Tested-by: Gary King <gking@nvidia.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/Kconfig | 23 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/odm_kit/Kconfig | 10 |
2 files changed, 15 insertions, 18 deletions
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index 2dfbc0a280c5..fe30e3d9461e 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig @@ -20,13 +20,19 @@ endchoice choice prompt "Select Tegra-based product" -config MACH_HARMONY - bool "Harmony board" +config MACH_TEGRA_GENERIC + bool "Tegra 2 Development System (Whistler, Harmony, Tango)" + select TEGRA_ODM_KIT help - Support for nVidia Harmony development platform + Support for NVIDIA Tegra 2 development platforms; requires + selection of an appropriate ODM kit for your specific development + system endchoice +config TEGRA_ODM_KIT + bool + choice prompt "Low-level debug console UART" default TEGRA_DEBUG_UART_NONE @@ -51,13 +57,8 @@ config TEGRA_DEBUG_UARTE endchoice -config MACH_TEGRA_GENERIC - bool - default y - config TEGRA_NVOS bool "Include Tegra NvOS interfaces" - depends on MACH_TEGRA_GENERIC default y help Adds the Tegra NvOS driver layer and associated user-space @@ -65,11 +66,11 @@ config TEGRA_NVOS config TEGRA_NVRM bool "Include Tegra NvRM interfaces" - depends on TEGRA_NVOS + depends on TEGRA_NVOS && TEGRA_ODM_KIT default n help Adds the Tegra NVRM driver layer and associated user-space - interfaces. + interfaces; requires a platform with an ODM kit implementation config TEGRA_IOVMM_GART bool "Enable I/O virtual memory manager for GART" @@ -119,7 +120,7 @@ config TEGRA_USB_CHARGE Enables charging over USB -if TEGRA_NVRM +if TEGRA_ODM_KIT source "arch/arm/mach-tegra/odm_kit/Kconfig" endif diff --git a/arch/arm/mach-tegra/odm_kit/Kconfig b/arch/arm/mach-tegra/odm_kit/Kconfig index dbf829f1b79e..489cd70feaf5 100644 --- a/arch/arm/mach-tegra/odm_kit/Kconfig +++ b/arch/arm/mach-tegra/odm_kit/Kconfig @@ -1,16 +1,12 @@ -if MACH_TEGRA_GENERIC - choice prompt "Select ODM kit target board" config TEGRA_ODM_HARMONY - bool "NVIDIA Harmony development system" - depends on ARCH_TEGRA_2x_SOC + bool "NVIDIA Tango or Harmony development system" + depends on ARCH_TEGRA_2x_SOC && MACH_TEGRA_GENERIC config TEGRA_ODM_WHISTLER bool "NVIDIA Whistler development system" - depends on ARCH_TEGRA_2x_SOC + depends on ARCH_TEGRA_2x_SOC && MACH_TEGRA_GENERIC endchoice - -endif |