ARM: tegra: Clean up makefile conditionals
Scott Williams [Thu, 1 Sep 2011 22:07:44 +0000 (15:07 -0700)]
Change-Id: I7789a192aad504957770b7632d4f5f9cd01b8c5d
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-on: http://git-master/r/50358
Reviewed-by: Dan Willemsen <dwillemsen@nvidia.com>

Rebase-Id: R94f5bab7f502627ce9bda7e07ea5afe4518bb1e2

arch/arm/mach-tegra/Makefile

index dee3b9d..ec776a3 100644 (file)
@@ -10,8 +10,11 @@ obj-y                                   += io.o
 obj-y                                   += irq.o
 obj-y                                   += clock.o
 obj-y                                   += timer.o
-obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += timer-t2.o
-obj-$(CONFIG_ARCH_TEGRA_3x_SOC)         += timer-t3.o
+ifeq ($(CONFIG_ARCH_TEGRA_2x_SOC),y)
+obj-y                                   += timer-t2.o
+else
+obj-y                                   += timer-t3.o
+endif
 obj-y                                   += pinmux.o
 obj-y                                   += delay.o
 obj-y                                   += pm.o
@@ -37,7 +40,6 @@ obj-y                                   += mc.o
 obj-$(CONFIG_USB_SUPPORT)               += usb_phy.o
 obj-$(CONFIG_FIQ)                       += fiq.o
 obj-$(CONFIG_TEGRA_ARB_SEMAPHORE)      += arb_sema.o
-obj-$(CONFIG_ARCH_TEGRA_2x_SOC)                += tegra20_speedo.o
 ifeq ($(CONFIG_TEGRA_SILICON_PLATFORM),y)
 obj-y                                   += dvfs.o
 obj-$(CONFIG_ARCH_TEGRA_3x_SOC)         += latency_allowance.o
@@ -55,6 +57,7 @@ obj-$(CONFIG_ARCH_TEGRA_2x_SOC)               += pm-t2.o
 obj-$(CONFIG_ARCH_TEGRA_3x_SOC)         += pm-t3.o
 obj-$(CONFIG_ARCH_TEGRA_2x_SOC)                += pinmux-tegra20-tables.o
 obj-$(CONFIG_ARCH_TEGRA_3x_SOC)                += pinmux-tegra30-tables.o
+obj-$(CONFIG_ARCH_TEGRA_2x_SOC)                += tegra20_speedo.o
 obj-$(CONFIG_ARCH_TEGRA_3x_SOC)                += tegra30_speedo.o
 obj-$(CONFIG_ARCH_TEGRA_3x_SOC)                += sleep-t30.o
 obj-$(CONFIG_SMP)                      += platsmp.o