diff options
author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 10:55:15 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 10:55:15 -0400 |
commit | 494cc7606180bbf0bd7c82afeaacc45d5035d7cc (patch) | |
tree | ff09bb45e12ffd9c2b141884e1a4cf921ba87c78 /arch/arm/Kconfig | |
parent | 3afeb0a046af159f0ff97a20cf6ebc44d0d2bd64 (diff) | |
parent | 9002722560ba86a2f59811e3d11a2575bf47e1f6 (diff) |
Merge tag 'tegra-for-3.10-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/multiplatform
From Stephen Warren <swarren@wwwdotorg.org>:
ARM: tegra: multi-platform conversion
This branch converts Tegra to support multi-platform/single-zImage.
One header is made accessible to drivers. The earlyprintk implementation
is moved to the multi-platform location. Some Kconfig changes are made
to enable multi-platform. Some dead files are deleted.
The APIs exposed in the now-global tegra-powergate.h should be replaced
with standard reset and power domain APIs in the future.
This branch is based on (part of) the previous soc pull request.
* tag 'tegra-for-3.10-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
ARM: tegra: convert to multi-platform
ARM: tegra: move <mach/powergate.h> to <linux/tegra-powergate.h>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r-- | arch/arm/Kconfig | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 6584941e0fab..3a6333e66b41 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -600,25 +600,6 @@ config ARCH_LPC32XX | |||
600 | help | 600 | help |
601 | Support for the NXP LPC32XX family of processors | 601 | Support for the NXP LPC32XX family of processors |
602 | 602 | ||
603 | config ARCH_TEGRA | ||
604 | bool "NVIDIA Tegra" | ||
605 | select ARCH_HAS_CPUFREQ | ||
606 | select ARCH_REQUIRE_GPIOLIB | ||
607 | select CLKDEV_LOOKUP | ||
608 | select CLKSRC_MMIO | ||
609 | select CLKSRC_OF | ||
610 | select COMMON_CLK | ||
611 | select GENERIC_CLOCKEVENTS | ||
612 | select HAVE_CLK | ||
613 | select HAVE_SMP | ||
614 | select MIGHT_HAVE_CACHE_L2X0 | ||
615 | select SOC_BUS | ||
616 | select SPARSE_IRQ | ||
617 | select USE_OF | ||
618 | help | ||
619 | This enables support for NVIDIA Tegra based systems (Tegra APX, | ||
620 | Tegra 6xx and Tegra 2 series). | ||
621 | |||
622 | config ARCH_PXA | 603 | config ARCH_PXA |
623 | bool "PXA2xx/PXA3xx-based" | 604 | bool "PXA2xx/PXA3xx-based" |
624 | depends on MMU | 605 | depends on MMU |