Skip to content

Commit

Permalink
ARM: tegra: convert to multi-platform
Browse files Browse the repository at this point in the history
This allows Tegra be included in a kernel build that supports multiple
SoCs at once, which is useful for distro kernels.

This change:
* Moves Tegra's Kconfig into its own directory, as seems typical for
  multi-platform conversions.
* Stops selecting some ARM errata that are incompatible with multi-
  platform. This requires that you use a bootloader that enables the
  workaround!
* Deletes some headers and Makefile.boot that aren't needed now that we
  support multi-platform.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
  • Loading branch information
Stephen Warren committed Mar 30, 2013
1 parent e4bcda2 commit 9002722
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 230 deletions.
19 changes: 0 additions & 19 deletions arch/arm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -663,25 +663,6 @@ config ARCH_LPC32XX
help
Support for the NXP LPC32XX family of processors

config ARCH_TEGRA
bool "NVIDIA Tegra"
select ARCH_HAS_CPUFREQ
select ARCH_REQUIRE_GPIOLIB
select CLKDEV_LOOKUP
select CLKSRC_MMIO
select CLKSRC_OF
select COMMON_CLK
select GENERIC_CLOCKEVENTS
select HAVE_CLK
select HAVE_SMP
select MIGHT_HAVE_CACHE_L2X0
select SOC_BUS
select SPARSE_IRQ
select USE_OF
help
This enables support for NVIDIA Tegra based systems (Tegra APX,
Tegra 6xx and Tegra 2 series).

config ARCH_PXA
bool "PXA2xx/PXA3xx-based"
depends on MMU
Expand Down
27 changes: 20 additions & 7 deletions arch/arm/mach-tegra/Kconfig
Original file line number Diff line number Diff line change
@@ -1,13 +1,28 @@
if ARCH_TEGRA
config ARCH_TEGRA
bool "NVIDIA Tegra" if ARCH_MULTI_V7
select ARCH_HAS_CPUFREQ
select ARCH_REQUIRE_GPIOLIB
select CLKDEV_LOOKUP
select CLKSRC_MMIO
select CLKSRC_OF
select COMMON_CLK
select GENERIC_CLOCKEVENTS
select HAVE_CLK
select HAVE_SMP
select MIGHT_HAVE_CACHE_L2X0
select SOC_BUS
select SPARSE_IRQ
select USE_OF
help
This enables support for NVIDIA Tegra based systems.

comment "NVIDIA Tegra options"
menu "NVIDIA Tegra options"
depends on ARCH_TEGRA

config ARCH_TEGRA_2x_SOC
bool "Enable support for Tegra20 family"
select ARCH_NEEDS_CPU_IDLE_COUPLED if SMP
select ARM_ERRATA_720789
select ARM_ERRATA_742230 if SMP
select ARM_ERRATA_751472
select ARM_ERRATA_754327 if SMP
select ARM_ERRATA_764369 if SMP
select ARM_GIC
Expand All @@ -26,8 +41,6 @@ config ARCH_TEGRA_2x_SOC

config ARCH_TEGRA_3x_SOC
bool "Enable support for Tegra30 family"
select ARM_ERRATA_743622
select ARM_ERRATA_751472
select ARM_ERRATA_754322
select ARM_ERRATA_764369 if SMP
select ARM_GIC
Expand Down Expand Up @@ -71,4 +84,4 @@ config TEGRA_AHB
config TEGRA_EMC_SCALING_ENABLE
bool "Enable scaling the memory frequency"

endif
endmenu
3 changes: 0 additions & 3 deletions arch/arm/mach-tegra/Makefile.boot

This file was deleted.

26 changes: 0 additions & 26 deletions arch/arm/mach-tegra/include/mach/timex.h

This file was deleted.

175 changes: 0 additions & 175 deletions arch/arm/mach-tegra/include/mach/uncompress.h

This file was deleted.

0 comments on commit 9002722

Please sign in to comment.