]> nv-tegra.nvidia Code Review - linux-3.10.git/blobdiff - arch/arm/mach-tegra/Makefile
ARM: Build fix after Tegra14 K3.4 merge
[linux-3.10.git] / arch / arm / mach-tegra / Makefile
index cc59807ca8a30fc6df215fcd72087ac6d4e8aaf6..a9584f46718b21d2e89a567b5e17bc583765f665 100644 (file)
@@ -1,39 +1,45 @@
 GCOV_PROFILE := y
 
 asflags-y                              += -march=armv7-a
+subdir-ccflags-y := -Werror
 
 obj-y                                   += board-pinmux.o
 obj-y                                   += ahb.o
 obj-y                                   += common.o
 obj-y                                   += devices.o
 obj-y                                   += board-info.o
-obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += common-t2.o
-obj-$(CONFIG_ARCH_TEGRA_3x_SOC)         += common-t3.o
 obj-y                                   += io.o
 obj-y                                   += irq.o
 obj-y                                   += clock.o
 obj-y                                   += timer.o
 obj-y                                   += timerinfo.o
-ifeq ($(CONFIG_ARCH_TEGRA_2x_SOC),y)
-obj-$(CONFIG_PM_SLEEP)                  += cpuidle-t2.o
-else
-obj-$(CONFIG_PM_SLEEP)                  += cpuidle-t3.o
-endif
 
 ifeq ($(CONFIG_ARCH_TEGRA_2x_SOC),y)
 obj-y                                   += common-t2.o
 obj-y                                   += pm-t2.o
-obj-y                                   += sleep-t2.o
+obj-$(CONFIG_ARCH_TEGRA_2x_SOC)                += sleep-t20.o
 obj-y                                   += timer-t2.o
 obj-y                                   += wakeups-t2.o
+ifeq ($(CONFIG_CPU_IDLE),y)
+obj-$(CONFIG_PM_SLEEP)                  += cpuidle-t2.o
+endif
 else
 obj-y                                   += common-t3.o
 obj-y                                   += pm-t3.o
 obj-y                                   += sleep-t30.o
+obj-$(CONFIG_DEBUG_FS)                  += clocks_stats.o
 obj-y                                   += timer-t3.o
+ifeq ($(CONFIG_ARCH_TEGRA_3x_SOC),y)
 obj-y                                   += wakeups-t3.o
-ifeq ($(CONFIG_TEGRA_AUTO_HOTPLUG),y)
-obj-y                                   += cpu-tegra3.o
+else
+obj-y                                  += wakeups-t11x.o
+endif
+ifeq ($(CONFIG_CPU_IDLE),y)
+ifeq ($(CONFIG_ARCH_TEGRA_3x_SOC),y)
+obj-$(CONFIG_PM_SLEEP)                  += cpuidle-t3.o
+else
+obj-$(CONFIG_PM_SLEEP)                  += cpuidle-t11x.o
+endif
 endif
 endif
 
@@ -43,7 +49,12 @@ obj-y                                   += pm.o
 obj-$(CONFIG_TEGRA_WDT_RECOVERY)        += wdt-recovery.o
 obj-$(CONFIG_PM_SLEEP)                  += pm-irq.o
 obj-y                                   += gic.o
-obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += sleep-t2.o
+
+obj-y                                   += sleep.o
+
+plus_sec := $(call as-instr,.arch_extension sec,+sec)
+AFLAGS_sleep.o :=-Wa,-march=armv7-a$(plus_sec)
+
 obj-y                                   += tegra_fuse.o
 obj-y                                   += kfuse.o
 obj-y                                   += csi.o
@@ -53,30 +64,32 @@ obj-y                                   += apbio.o
 obj-y                                   += mc.o
 obj-$(CONFIG_USB_SUPPORT)               += tegra3_usb_phy.o
 obj-$(CONFIG_USB_SUPPORT)               += tegra2_usb_phy.o
+obj-$(CONFIG_USB_SUPPORT)               += tegra11x_usb_phy.o
 obj-$(CONFIG_FIQ)                       += fiq.o
 obj-$(CONFIG_TEGRA_FIQ_DEBUGGER)        += tegra_fiq_debugger.o
 obj-$(CONFIG_TEGRA_ARB_SEMAPHORE)       += arb_sema.o
-ifeq ($(CONFIG_TEGRA_SILICON_PLATFORM),y)
 obj-y                                   += dvfs.o
 obj-$(CONFIG_ARCH_TEGRA_11x_SOC)        += tegra11_dvfs.o
-obj-y                                   += latency_allowance.o
+obj-$(CONFIG_ARCH_TEGRA_14x_SOC)        += tegra11_dvfs.o
+ifeq ($(CONFIG_TEGRA_SILICON_PLATFORM),y)
+obj-$(CONFIG_TEGRA_LATENCY_ALLOWANCE)   += latency_allowance.o
 obj-$(CONFIG_TEGRA_EDP_LIMITS)          += edp.o
+obj-$(CONFIG_TEGRA_CORE_EDP_LIMITS)     += edp_core.o
+obj-$(CONFIG_ARCH_TEGRA_11x_SOC)        += tegra11_edp.o
 endif
 ifeq ($(CONFIG_TEGRA_SILICON_PLATFORM),y)
 obj-$(CONFIG_ARCH_TEGRA_11x_SOC)        += tegra11_speedo.o
 obj-$(CONFIG_ARCH_TEGRA_3x_SOC)         += tegra3_actmon.o
 endif
+obj-$(CONFIG_ARCH_TEGRA_11x_SOC)        += tegra3_actmon.o
 obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += tegra2_emc.o
 obj-$(CONFIG_ARCH_TEGRA_3x_SOC)         += tegra3_emc.o
 obj-$(CONFIG_ARCH_TEGRA_11x_SOC)        += tegra11_emc.o
-obj-$(CONFIG_ARCH_TEGRA_2x_SOC)                += sleep-t20.o
-obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += wakeups-t2.o
-obj-$(CONFIG_ARCH_TEGRA_3x_SOC)         += wakeups-t3.o
-obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += pm-t2.o
-obj-$(CONFIG_ARCH_TEGRA_3x_SOC)         += pm-t3.o
+obj-$(CONFIG_ARCH_TEGRA_14x_SOC)        += tegra11_emc.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_11x_SOC)        += pinmux-t11-tables.o
+obj-$(CONFIG_ARCH_TEGRA_14x_SOC)        += pinmux-t14-tables.o
 obj-$(CONFIG_ARCH_TEGRA_2x_SOC)                += tegra20_speedo.o
 obj-$(CONFIG_ARCH_TEGRA_3x_SOC)                += tegra30_speedo.o
 obj-$(CONFIG_HOTPLUG_CPU)               += hotplug.o
@@ -85,21 +98,27 @@ obj-y                                       += flowctrl.o
 obj-$(CONFIG_CPU_IDLE)                 += cpuidle.o
 obj-$(CONFIG_CPU_IDLE)                 += sleep.o
 obj-$(CONFIG_ARCH_TEGRA_11x_SOC)        += tegra11_clocks.o
+obj-$(CONFIG_ARCH_TEGRA_14x_SOC)        += tegra11_clocks.o
 obj-$(CONFIG_SMP)                       += platsmp.o
 obj-y                                   += reset.o
 obj-y                                   += headsmp.o
 obj-$(CONFIG_CPU_FREQ)                  += cpu-tegra.o
-obj-$(CONFIG_TEGRA_PCI)                 += pcie.o
-ifeq ($(CONFIG_CPU_IDLE),y)
-ifeq ($(CONFIG_PM_SLEEP),y)
-obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += cpuidle-t2.o
-obj-$(CONFIG_ARCH_TEGRA_3x_SOC)         += cpuidle-t3.o
+ifeq ($(CONFIG_TEGRA_AUTO_HOTPLUG),y)
+ifeq ($(CONFIG_TEGRA_CPUQUIET),y)
+obj-$(CONFIG_ARCH_TEGRA_3x_SOC)                += cpuquiet.o
+obj-$(CONFIG_ARCH_TEGRA_11x_SOC)       += cpuquiet.o
+else
+obj-$(CONFIG_ARCH_TEGRA_3x_SOC)         += cpu-tegra3.o
 endif
 endif
+obj-$(CONFIG_TEGRA_PCI)                 += pcie.o
+ifeq ($(CONFIG_TEGRA_SOCTHERM),y)
+obj-$(CONFIG_ARCH_TEGRA_11x_SOC)        += tegra11_soctherm.o
+endif
 ifeq ($(CONFIG_TEGRA_THERMAL_THROTTLE),y)
 obj-$(CONFIG_ARCH_TEGRA_3x_SOC)         += tegra3_throttle.o
+obj-$(CONFIG_ARCH_TEGRA_11x_SOC)        += tegra3_throttle.o
 endif
-obj-$(CONFIG_ARCH_TEGRA_3x_SOC)         += tegra3_thermal.o
 obj-$(CONFIG_DEBUG_ICEDCC)              += sysfs-dcc.o
 obj-$(CONFIG_TEGRA_CLUSTER_CONTROL)     += sysfs-cluster.o
 obj-$(CONFIG_SENSORS_TEGRA_TSENSOR)     += tegra3_tsensor.o
@@ -114,16 +133,71 @@ obj-$(CONFIG_ARCH_TEGRA_2x_SOC)           += board-harmony-pcie.o
 
 obj-$(CONFIG_ARCH_TEGRA_2x_SOC)                += board-paz00.o
 
+obj-y                                  += board-common.o
+obj-$(CONFIG_TEGRA_WAKEUP_MONITOR)      += tegra_wakeup_monitor.o
+
+# MC error reporting.
+ifeq ($(CONFIG_ARCH_TEGRA_2x_SOC),)
+obj-y                                   += mcerr.o
+ifeq ($(CONFIG_ARCH_TEGRA_3x_SOC),y)
+obj-y                                   += mcerr-t3.o
+else
+obj-y                                   += mcerr-t11.o
+endif
+endif
+
 obj-${CONFIG_MACH_CURACAO}              += board-curacao.o
 obj-${CONFIG_MACH_CURACAO}              += board-curacao-panel.o
 obj-${CONFIG_MACH_CURACAO}              += board-curacao-pinmux.o
 obj-${CONFIG_MACH_CURACAO}              += board-curacao-power.o
 obj-${CONFIG_MACH_CURACAO}              += board-curacao-sdhci.o
 obj-${CONFIG_MACH_CURACAO}              += board-curacao-sensors.o
+obj-${CONFIG_MACH_CURACAO}              += board-curacao-memory.o
 
 obj-${CONFIG_MACH_KAI}                  += board-touch-kai-synaptics-spi.o
 obj-y                                   += board-touch-raydium_spi.o
 
+obj-${CONFIG_MACH_DALMORE}              += board-dalmore.o
+obj-${CONFIG_MACH_DALMORE}              += board-dalmore-memory.o
+obj-${CONFIG_MACH_DALMORE}              += board-dalmore-pinmux.o
+obj-${CONFIG_MACH_DALMORE}              += board-dalmore-power.o
+obj-${CONFIG_MACH_DALMORE}              += board-dalmore-powermon.o
+obj-${CONFIG_MACH_DALMORE}              += board-dalmore-sdhci.o
+obj-${CONFIG_MACH_DALMORE}              += board-dalmore-panel.o
+obj-${CONFIG_MACH_DALMORE}              += board-roth-panel.o
+obj-${CONFIG_MACH_DALMORE}              += board-dalmore-kbc.o
+obj-${CONFIG_MACH_DALMORE}             += board-dalmore-sensors.o
+obj-${CONFIG_MACH_DALMORE}              += panel-a-1080p-11-6.o
+obj-${CONFIG_MACH_DALMORE}              += panel-p-wuxga-10-1.o
+obj-${CONFIG_MACH_DALMORE}              += panel-s-wqxga-10-1.o
+
+obj-${CONFIG_MACH_TEGRA_PLUTO}          += board-pluto.o
+obj-${CONFIG_MACH_TEGRA_PLUTO}          += board-pluto-memory.o
+obj-${CONFIG_MACH_TEGRA_PLUTO}          += board-pluto-pinmux.o
+obj-${CONFIG_MACH_TEGRA_PLUTO}          += board-pluto-power.o
+obj-${CONFIG_MACH_TEGRA_PLUTO}          += board-pluto-sdhci.o
+obj-${CONFIG_MACH_TEGRA_PLUTO}          += board-pluto-panel.o
+obj-${CONFIG_MACH_TEGRA_PLUTO}          += board-pluto-kbc.o
+obj-${CONFIG_MACH_TEGRA_PLUTO}          += board-pluto-sensors.o
+obj-${CONFIG_MACH_TEGRA_PLUTO}          += board-pluto-powermon.o
+obj-${CONFIG_MACH_TEGRA_PLUTO}          += panel-l-720p-5.o
+obj-${CONFIG_MACH_TEGRA_PLUTO}          += panel-j-720p-4-7.o
+obj-${CONFIG_MACH_TEGRA_PLUTO}          += panel-s-1080p-5.o
+
 obj-${CONFIG_TEGRA_BB_XMM_POWER}        += baseband-xmm-power.o
 obj-${CONFIG_TEGRA_BB_XMM_POWER2}       += baseband-xmm-power2.o
 
+obj-${CONFIG_TEGRA_ISOMGR}              += isomgr.o
+
+obj-${CONFIG_TEGRA_NVDUMPER}            += nvdumper.o
+
+obj-${CONFIG_MACH_ROTH}                 += board-roth.o
+obj-${CONFIG_MACH_ROTH}                 += board-roth-memory.o
+obj-${CONFIG_MACH_ROTH}                 += board-roth-pinmux.o
+obj-${CONFIG_MACH_ROTH}                 += board-roth-power.o
+obj-${CONFIG_MACH_ROTH}                 += board-roth-powermon.o
+obj-${CONFIG_MACH_ROTH}                 += board-roth-sdhci.o
+obj-${CONFIG_MACH_ROTH}                 += board-roth-panel.o
+obj-${CONFIG_MACH_ROTH}                 += board-roth-kbc.o
+obj-${CONFIG_MACH_ROTH}                 += board-roth-sensors.o
+obj-${CONFIG_MACH_ROTH}                        += board-roth-fan.o