diff options
Diffstat (limited to 'arch/arm/mach-omap2/Makefile')
-rw-r--r-- | arch/arm/mach-omap2/Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index b167152ca69f..3e7d54af4c91 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile | |||
@@ -6,7 +6,7 @@ | |||
6 | obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer.o pm.o \ | 6 | obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer.o pm.o \ |
7 | common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o | 7 | common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o |
8 | 8 | ||
9 | omap-2-3-common = irq.o sdrc.o | 9 | omap-2-3-common = irq.o |
10 | hwmod-common = omap_hwmod.o \ | 10 | hwmod-common = omap_hwmod.o \ |
11 | omap_hwmod_common_data.o | 11 | omap_hwmod_common_data.o |
12 | clock-common = clock.o clock_common_data.o \ | 12 | clock-common = clock.o clock_common_data.o \ |
@@ -16,12 +16,14 @@ secure-common = omap-smc.o omap-secure.o | |||
16 | obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common) | 16 | obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common) |
17 | obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(hwmod-common) $(secure-common) | 17 | obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(hwmod-common) $(secure-common) |
18 | obj-$(CONFIG_ARCH_OMAP4) += prm44xx.o $(hwmod-common) $(secure-common) | 18 | obj-$(CONFIG_ARCH_OMAP4) += prm44xx.o $(hwmod-common) $(secure-common) |
19 | obj-$(CONFIG_SOC_AM33XX) += irq.o $(hwmod-common) | ||
19 | 20 | ||
20 | ifneq ($(CONFIG_SND_OMAP_SOC_MCBSP),) | 21 | ifneq ($(CONFIG_SND_OMAP_SOC_MCBSP),) |
21 | obj-y += mcbsp.o | 22 | obj-y += mcbsp.o |
22 | endif | 23 | endif |
23 | 24 | ||
24 | obj-$(CONFIG_TWL4030_CORE) += omap_twl.o | 25 | obj-$(CONFIG_TWL4030_CORE) += omap_twl.o |
26 | obj-$(CONFIG_SOC_HAS_OMAP2_SDRC) += sdrc.o | ||
25 | 27 | ||
26 | # SMP support ONLY available for OMAP4 | 28 | # SMP support ONLY available for OMAP4 |
27 | 29 | ||
@@ -100,6 +102,7 @@ obj-$(CONFIG_ARCH_OMAP3) += $(voltagedomain-common) | |||
100 | obj-$(CONFIG_ARCH_OMAP3) += voltagedomains3xxx_data.o | 102 | obj-$(CONFIG_ARCH_OMAP3) += voltagedomains3xxx_data.o |
101 | obj-$(CONFIG_ARCH_OMAP4) += $(voltagedomain-common) | 103 | obj-$(CONFIG_ARCH_OMAP4) += $(voltagedomain-common) |
102 | obj-$(CONFIG_ARCH_OMAP4) += voltagedomains44xx_data.o | 104 | obj-$(CONFIG_ARCH_OMAP4) += voltagedomains44xx_data.o |
105 | obj-$(CONFIG_SOC_AM33XX) += $(voltagedomain-common) | ||
103 | obj-$(CONFIG_SOC_AM33XX) += voltagedomains33xx_data.o | 106 | obj-$(CONFIG_SOC_AM33XX) += voltagedomains33xx_data.o |
104 | 107 | ||
105 | # OMAP powerdomain framework | 108 | # OMAP powerdomain framework |
@@ -115,12 +118,12 @@ obj-$(CONFIG_ARCH_OMAP3) += powerdomains2xxx_3xxx_data.o | |||
115 | obj-$(CONFIG_ARCH_OMAP4) += $(powerdomain-common) | 118 | obj-$(CONFIG_ARCH_OMAP4) += $(powerdomain-common) |
116 | obj-$(CONFIG_ARCH_OMAP4) += powerdomain44xx.o | 119 | obj-$(CONFIG_ARCH_OMAP4) += powerdomain44xx.o |
117 | obj-$(CONFIG_ARCH_OMAP4) += powerdomains44xx_data.o | 120 | obj-$(CONFIG_ARCH_OMAP4) += powerdomains44xx_data.o |
121 | obj-$(CONFIG_SOC_AM33XX) += $(powerdomain-common) | ||
118 | obj-$(CONFIG_SOC_AM33XX) += powerdomain33xx.o | 122 | obj-$(CONFIG_SOC_AM33XX) += powerdomain33xx.o |
119 | obj-$(CONFIG_SOC_AM33XX) += powerdomains33xx_data.o | 123 | obj-$(CONFIG_SOC_AM33XX) += powerdomains33xx_data.o |
120 | 124 | ||
121 | # PRCM clockdomain control | 125 | # PRCM clockdomain control |
122 | clockdomain-common += clockdomain.o | 126 | clockdomain-common += clockdomain.o |
123 | clockdomain-common += clockdomains_common_data.o | ||
124 | obj-$(CONFIG_ARCH_OMAP2) += $(clockdomain-common) | 127 | obj-$(CONFIG_ARCH_OMAP2) += $(clockdomain-common) |
125 | obj-$(CONFIG_ARCH_OMAP2) += clockdomain2xxx_3xxx.o | 128 | obj-$(CONFIG_ARCH_OMAP2) += clockdomain2xxx_3xxx.o |
126 | obj-$(CONFIG_ARCH_OMAP2) += clockdomains2xxx_3xxx_data.o | 129 | obj-$(CONFIG_ARCH_OMAP2) += clockdomains2xxx_3xxx_data.o |
@@ -133,6 +136,7 @@ obj-$(CONFIG_ARCH_OMAP3) += clockdomains3xxx_data.o | |||
133 | obj-$(CONFIG_ARCH_OMAP4) += $(clockdomain-common) | 136 | obj-$(CONFIG_ARCH_OMAP4) += $(clockdomain-common) |
134 | obj-$(CONFIG_ARCH_OMAP4) += clockdomain44xx.o | 137 | obj-$(CONFIG_ARCH_OMAP4) += clockdomain44xx.o |
135 | obj-$(CONFIG_ARCH_OMAP4) += clockdomains44xx_data.o | 138 | obj-$(CONFIG_ARCH_OMAP4) += clockdomains44xx_data.o |
139 | obj-$(CONFIG_SOC_AM33XX) += $(clockdomain-common) | ||
136 | obj-$(CONFIG_SOC_AM33XX) += clockdomain33xx.o | 140 | obj-$(CONFIG_SOC_AM33XX) += clockdomain33xx.o |
137 | obj-$(CONFIG_SOC_AM33XX) += clockdomains33xx_data.o | 141 | obj-$(CONFIG_SOC_AM33XX) += clockdomains33xx_data.o |
138 | 142 | ||
@@ -252,9 +256,6 @@ obj-y += $(omap-flash-y) $(omap-flash-m) | |||
252 | omap-hsmmc-$(CONFIG_MMC_OMAP_HS) := hsmmc.o | 256 | omap-hsmmc-$(CONFIG_MMC_OMAP_HS) := hsmmc.o |
253 | obj-y += $(omap-hsmmc-m) $(omap-hsmmc-y) | 257 | obj-y += $(omap-hsmmc-m) $(omap-hsmmc-y) |
254 | 258 | ||
255 | |||
256 | usbfs-$(CONFIG_ARCH_OMAP_OTG) := usb-fs.o | ||
257 | obj-y += $(usbfs-m) $(usbfs-y) | ||
258 | obj-y += usb-musb.o | 259 | obj-y += usb-musb.o |
259 | obj-y += omap_phy_internal.o | 260 | obj-y += omap_phy_internal.o |
260 | 261 | ||