diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-23 20:34:48 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-23 20:34:48 -0400 |
commit | f1d2c07d331f717da79a42952be7dc1c0d35f846 (patch) | |
tree | 5bc98d2d63a37b688b40a4641855c512b385d0ae /arch/arm/mach-tegra/Makefile | |
parent | a17f29a5e98c0a32a900a773083c719e27f4bc0e (diff) | |
parent | d003e09891fdc0c170b99328eba7ed004809ef5a (diff) |
Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull arm-soc board specific updates from Arnd Bergmann:
"These changes are all for individual board files. In the long run,
those files will largely go away, and the amount of changes appears to
be continuously decreasing, which is a good sign. This time around,
changes are focused on tegra, omap and samsung."
Fix conflicts in arch/arm/mach-{omap2/common-board-devices.c,tegra/Makefile.boot}
as per the 'for-linus' branch.
* tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (39 commits)
ARM: EXYNOS: Add leds status1 and status2 on Origen board
ARM: S3C64XX: Mark most Cragganmore initdata devinitdata
ARM: EXYNOS: Add missing .reserve field to SMDKC210
ARM: EXYNOS: Add DRM device to SMDK4X12 board
ARM: S3C64XX: Clean up after SPI driver platform data updates
ARM: SAMSUNG: no need to set the value for clk_xusbxti when it is 24Mhz
ARM: EXYNOS: Add framebuffer support for SMDK4X12
ARM: EXYNOS: Add HSOTG support to SMDK4X12
ARM: S5PV210: Add audio platform device in Goni board
ARM: S5PV210: Add audio platform device in Aquila board
ARM: EXYNOS: Add audio platform device in SMDKV310 board
ARM: S3C64XX: Don't specify an irq_base for WM1192-EV1 board
ARM: OMAP3: Fix omap3evm randconfig error introduced by VBUS support
ARM: OMAP: board-omap4panda: MUX configuration for sys_nirq2
ARM: OMAP: board-4430sdp: MUX configuration for sys_nirq2
ARM: OMAP3530evm: set pendown_state and debounce time for ads7846
ARM: omap3evm: enable VBUS switch for EHCI tranceiver
ARM: OMAP3EVM: Adding USB internal LDOs board file
ARM: OMAP3EVM: Add NAND flash definition
ARM: OMAP3: cm-t35: add tvp5150 decoder support
...
Diffstat (limited to 'arch/arm/mach-tegra/Makefile')
-rw-r--r-- | arch/arm/mach-tegra/Makefile | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile index 90aae34245cd..c3d7303b9ac8 100644 --- a/arch/arm/mach-tegra/Makefile +++ b/arch/arm/mach-tegra/Makefile | |||
@@ -14,7 +14,6 @@ obj-$(CONFIG_CPU_IDLE) += cpuidle.o | |||
14 | obj-$(CONFIG_CPU_IDLE) += sleep.o | 14 | obj-$(CONFIG_CPU_IDLE) += sleep.o |
15 | obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra2_clocks.o | 15 | obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra2_clocks.o |
16 | obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra2_emc.o | 16 | obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra2_emc.o |
17 | obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += board-dt-tegra30.o | ||
18 | obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += tegra30_clocks.o | 17 | obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += tegra30_clocks.o |
19 | obj-$(CONFIG_SMP) += platsmp.o headsmp.o | 18 | obj-$(CONFIG_SMP) += platsmp.o headsmp.o |
20 | obj-$(CONFIG_SMP) += reset.o | 19 | obj-$(CONFIG_SMP) += reset.o |
@@ -24,6 +23,9 @@ obj-$(CONFIG_CPU_FREQ) += cpu-tegra.o | |||
24 | obj-$(CONFIG_TEGRA_PCI) += pcie.o | 23 | obj-$(CONFIG_TEGRA_PCI) += pcie.o |
25 | obj-$(CONFIG_USB_SUPPORT) += usb_phy.o | 24 | obj-$(CONFIG_USB_SUPPORT) += usb_phy.o |
26 | 25 | ||
26 | obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += board-dt-tegra20.o | ||
27 | obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += board-dt-tegra30.o | ||
28 | |||
27 | obj-$(CONFIG_MACH_HARMONY) += board-harmony.o | 29 | obj-$(CONFIG_MACH_HARMONY) += board-harmony.o |
28 | obj-$(CONFIG_MACH_HARMONY) += board-harmony-pinmux.o | 30 | obj-$(CONFIG_MACH_HARMONY) += board-harmony-pinmux.o |
29 | obj-$(CONFIG_MACH_HARMONY) += board-harmony-pcie.o | 31 | obj-$(CONFIG_MACH_HARMONY) += board-harmony-pcie.o |
@@ -32,14 +34,5 @@ obj-$(CONFIG_MACH_HARMONY) += board-harmony-power.o | |||
32 | obj-$(CONFIG_MACH_PAZ00) += board-paz00.o | 34 | obj-$(CONFIG_MACH_PAZ00) += board-paz00.o |
33 | obj-$(CONFIG_MACH_PAZ00) += board-paz00-pinmux.o | 35 | obj-$(CONFIG_MACH_PAZ00) += board-paz00-pinmux.o |
34 | 36 | ||
35 | obj-$(CONFIG_MACH_SEABOARD) += board-seaboard.o | ||
36 | obj-$(CONFIG_MACH_SEABOARD) += board-seaboard-pinmux.o | ||
37 | |||
38 | obj-$(CONFIG_MACH_TEGRA_DT) += board-dt-tegra20.o | ||
39 | obj-$(CONFIG_MACH_TEGRA_DT) += board-harmony-pinmux.o | ||
40 | obj-$(CONFIG_MACH_TEGRA_DT) += board-seaboard-pinmux.o | ||
41 | obj-$(CONFIG_MACH_TEGRA_DT) += board-paz00-pinmux.o | ||
42 | obj-$(CONFIG_MACH_TEGRA_DT) += board-trimslice-pinmux.o | ||
43 | |||
44 | obj-$(CONFIG_MACH_TRIMSLICE) += board-trimslice.o | 37 | obj-$(CONFIG_MACH_TRIMSLICE) += board-trimslice.o |
45 | obj-$(CONFIG_MACH_TRIMSLICE) += board-trimslice-pinmux.o | 38 | obj-$(CONFIG_MACH_TRIMSLICE) += board-trimslice-pinmux.o |