diff options
| author |   Jeff Ohlstein <johlstei@codeaurora.org> | 2010-08-12 13:02:56 -0700 |
|---|---|---|
| committer |   Daniel Walker <dwalker@codeaurora.org> | 2010-10-08 15:12:44 -0700 |
| commit | 569fb6e3e60eef77941c319562271daf759e634d (patch) | |
| tree | 4e742334c205e5c390145b62a9fdf387b72f1929 /arch/arm/mach-msm/Makefile | |
| parent | msm: allow uart to be conditionally disabled (diff) | |
| download | linux-dev-569fb6e3e60eef77941c319562271daf759e634d.tar.xz linux-dev-569fb6e3e60eef77941c319562271daf759e634d.zip | |
msm: add build support for msm8x60 target
Signed-off-by: Jeff Ohlstein <johlstei@codeaurora.org>
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
Diffstat (limited to 'arch/arm/mach-msm/Makefile')
| -rw-r--r-- | arch/arm/mach-msm/Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile index 869c8695d3c6..4937e14fc822 100644 --- a/arch/arm/mach-msm/Makefile +++ b/arch/arm/mach-msm/Makefile @@ -1,11 +1,16 @@ -obj-y += io.o idle.o timer.o dma.o +obj-y += io.o idle.o timer.o +ifndef CONFIG_ARCH_MSM8X60 obj-y += acpuclock-arm11.o +obj-y += dma.o +endif ifdef CONFIG_MSM_VIC obj-y += irq-vic.o else +ifndef CONFIG_ARCH_MSM8X60 obj-y += irq.o endif +endif obj-$(CONFIG_ARCH_MSM8X60) += clock-dummy.o obj-$(CONFIG_MSM_PROC_COMM) += proc_comm.o clock-pcom.o vreg.o @@ -18,6 +23,7 @@ obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o board-trout-mmc.o d obj-$(CONFIG_MACH_HALIBUT) += board-halibut.o devices-msm7x00.o obj-$(CONFIG_ARCH_MSM7X30) += board-msm7x30.o devices-msm7x30.o obj-$(CONFIG_ARCH_QSD8X50) += board-qsd8x50.o devices-qsd8x50.o +obj-$(CONFIG_ARCH_MSM8X60) += board-msm8x60.o obj-$(CONFIG_ARCH_MSM7X30) += gpiomux-7x30.o gpiomux-v1.o gpiomux.o obj-$(CONFIG_ARCH_QSD8X50) += gpiomux-8x50.o gpiomux-v1.o gpiomux.o |