From 85bddc2f178a8da61d4c40b0a9bad19f334940ee Mon Sep 17 00:00:00 2001 From: Paul Walmsley Date: Tue, 11 Sep 2012 19:09:13 -0600 Subject: [PATCH] --- yaml --- r: 326523 b: refs/heads/master c: fcbde335fe532feb80f052ef41ccb499476df064 h: refs/heads/master i: 326521: 9abea17b0ce799aa3f9d621f3ec8d7b42c7774fb 326519: 69aafbece7289b470898d6b26195353842134554 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/Makefile | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 5705775767ac..991e4fd4296a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 032c1bbe9b1d93010b63f142752572f1e181ee34 +refs/heads/master: fcbde335fe532feb80f052ef41ccb499476df064 diff --git a/trunk/arch/arm/mach-omap2/Makefile b/trunk/arch/arm/mach-omap2/Makefile index 22ee34077c01..bdcf50805a89 100644 --- a/trunk/arch/arm/mach-omap2/Makefile +++ b/trunk/arch/arm/mach-omap2/Makefile @@ -4,20 +4,18 @@ # Common support 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 + common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o omap-2-3-common = irq.o -hwmod-common = omap_hwmod.o \ - omap_hwmod_common_data.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) $(hwmod-common) -obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(hwmod-common) $(secure-common) -obj-$(CONFIG_ARCH_OMAP4) += prm44xx.o $(hwmod-common) $(secure-common) -obj-$(CONFIG_SOC_AM33XX) += irq.o $(hwmod-common) -obj-$(CONFIG_SOC_OMAP5) += prm44xx.o $(hwmod-common) $(secure-common) +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) ifneq ($(CONFIG_SND_OMAP_SOC_MCBSP),) obj-y += mcbsp.o @@ -181,6 +179,7 @@ obj-$(CONFIG_SOC_OMAP2420) += opp2420_data.o obj-$(CONFIG_SOC_OMAP2430) += opp2430_data.o # hwmod data +obj-y += omap_hwmod_common_data.o obj-$(CONFIG_SOC_OMAP2420) += omap_hwmod_2xxx_ipblock_data.o obj-$(CONFIG_SOC_OMAP2420) += omap_hwmod_2xxx_3xxx_ipblock_data.o obj-$(CONFIG_SOC_OMAP2420) += omap_hwmod_2xxx_interconnect_data.o