diff options
| author |   Paul Walmsley <paul@pwsan.com> | 2012-09-11 19:09:14 -0600 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2012-09-11 19:09:14 -0600 |
| commit | 445d12a9f8623e343607c4c131e299d090b472d6 (patch) | |
| tree | 788780d72a96cf687f6948f69b78656c3c62b6f1 /arch/arm/mach-omap2/Makefile | |
| parent | ARM: OMAP2+: clean up omap_hwmod.o build directives in Makefile (diff) | |
| download | linux-dev-445d12a9f8623e343607c4c131e299d090b472d6.tar.xz linux-dev-445d12a9f8623e343607c4c131e299d090b472d6.zip | |
ARM: OMAP2+: move MPU INTCPS, secure monitor, SDRC build directives in Makefile
Move MPU INTCPS (interrupt controller) and secure monitor code build
directives to their own Makefile sections, for clarity. Coalesce
SDRC-related Makefile directives into the SDRC Makefile section.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to '')
| -rw-r--r-- | arch/arm/mach-omap2/Makefile | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index bdcf50805a89..437ca3220718 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -6,23 +6,27 @@ obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer.o pm.o \ common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o -omap-2-3-common = irq.o clock-common = clock.o clock_common_data.o \ clkt_dpll.o clkt_clksel.o -secure-common = omap-smc.o omap-secure.o -obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) -obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(secure-common) -obj-$(CONFIG_ARCH_OMAP4) += prm44xx.o $(secure-common) -obj-$(CONFIG_SOC_AM33XX) += irq.o -obj-$(CONFIG_SOC_OMAP5) += prm44xx.o $(secure-common) +# INTCPS IP block support - XXX should be moved to drivers/ +obj-$(CONFIG_ARCH_OMAP2) += irq.o +obj-$(CONFIG_ARCH_OMAP3) += irq.o +obj-$(CONFIG_SOC_AM33XX) += irq.o + +# Secure monitor API support +obj-$(CONFIG_ARCH_OMAP3) += omap-smc.o omap-secure.o +obj-$(CONFIG_ARCH_OMAP4) += omap-smc.o omap-secure.o +obj-$(CONFIG_SOC_OMAP5) += omap-smc.o omap-secure.o + +obj-$(CONFIG_ARCH_OMAP4) += prm44xx.o +obj-$(CONFIG_SOC_OMAP5) += prm44xx.o ifneq ($(CONFIG_SND_OMAP_SOC_MCBSP),) obj-y += mcbsp.o endif obj-$(CONFIG_TWL4030_CORE) += omap_twl.o -obj-$(CONFIG_SOC_HAS_OMAP2_SDRC) += sdrc.o # SMP support ONLY available for OMAP4 @@ -56,6 +60,7 @@ obj-$(CONFIG_ARCH_OMAP4) += mux44xx.o # SMS/SDRC obj-$(CONFIG_ARCH_OMAP2) += sdrc2xxx.o # obj-$(CONFIG_ARCH_OMAP3) += sdrc3xxx.o +obj-$(CONFIG_SOC_HAS_OMAP2_SDRC) += sdrc.o # OPP table initialization ifeq ($(CONFIG_PM_OPP),y) |