aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-tegra/Makefile
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2012-05-21 17:07:19 -0400
committerStephen Warren <swarren@nvidia.com>2012-06-20 14:37:41 -0400
commit2c95b7e06f63b264500fbcd5b4718c1a7258aa76 (patch)
tree1376bb5105df7d6de49d35527717597e35baa6c5 /arch/arm/mach-tegra/Makefile
parent9132b0ed57320996b16eafbf651a04e02ad29092 (diff)
ARM: tegra: remove CONFIG_MACH_TEGRA_DT
* Make ARCH_TEGRA select USE_OF; DT is the way forward. * Build board-dt-tegra*.c when the relevant Tegra SoC support is enabled, rather than requiring a specific config option for this. * The board-specific config options already build board-*-pinmux.o, and when booting from device tree these files are no longer needed, so we can remove some Makefile commands related to those files. Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/Makefile')
-rw-r--r--arch/arm/mach-tegra/Makefile10
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile
index 2eb4445ddb14..60a02132d2da 100644
--- a/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@ -13,7 +13,6 @@ obj-$(CONFIG_CPU_IDLE) += sleep.o
13obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += powergate.o 13obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += powergate.o
14obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra2_clocks.o 14obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra2_clocks.o
15obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra2_emc.o 15obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra2_emc.o
16obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += board-dt-tegra30.o
17obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += tegra30_clocks.o 16obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += tegra30_clocks.o
18obj-$(CONFIG_SMP) += platsmp.o headsmp.o 17obj-$(CONFIG_SMP) += platsmp.o headsmp.o
19obj-$(CONFIG_SMP) += reset.o 18obj-$(CONFIG_SMP) += reset.o
@@ -23,6 +22,9 @@ obj-$(CONFIG_CPU_FREQ) += cpu-tegra.o
23obj-$(CONFIG_TEGRA_PCI) += pcie.o 22obj-$(CONFIG_TEGRA_PCI) += pcie.o
24obj-$(CONFIG_USB_SUPPORT) += usb_phy.o 23obj-$(CONFIG_USB_SUPPORT) += usb_phy.o
25 24
25obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += board-dt-tegra20.o
26obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += board-dt-tegra30.o
27
26obj-$(CONFIG_MACH_HARMONY) += board-harmony.o 28obj-$(CONFIG_MACH_HARMONY) += board-harmony.o
27obj-$(CONFIG_MACH_HARMONY) += board-harmony-pinmux.o 29obj-$(CONFIG_MACH_HARMONY) += board-harmony-pinmux.o
28obj-$(CONFIG_MACH_HARMONY) += board-harmony-pcie.o 30obj-$(CONFIG_MACH_HARMONY) += board-harmony-pcie.o
@@ -34,11 +36,5 @@ obj-$(CONFIG_MACH_PAZ00) += board-paz00-pinmux.o
34obj-$(CONFIG_MACH_SEABOARD) += board-seaboard.o 36obj-$(CONFIG_MACH_SEABOARD) += board-seaboard.o
35obj-$(CONFIG_MACH_SEABOARD) += board-seaboard-pinmux.o 37obj-$(CONFIG_MACH_SEABOARD) += board-seaboard-pinmux.o
36 38
37obj-$(CONFIG_MACH_TEGRA_DT) += board-dt-tegra20.o
38obj-$(CONFIG_MACH_TEGRA_DT) += board-harmony-pinmux.o
39obj-$(CONFIG_MACH_TEGRA_DT) += board-seaboard-pinmux.o
40obj-$(CONFIG_MACH_TEGRA_DT) += board-paz00-pinmux.o
41obj-$(CONFIG_MACH_TEGRA_DT) += board-trimslice-pinmux.o
42
43obj-$(CONFIG_MACH_TRIMSLICE) += board-trimslice.o 39obj-$(CONFIG_MACH_TRIMSLICE) += board-trimslice.o
44obj-$(CONFIG_MACH_TRIMSLICE) += board-trimslice-pinmux.o 40obj-$(CONFIG_MACH_TRIMSLICE) += board-trimslice-pinmux.o