← Back to branch summary

~ubuntu-branches/ubuntu/vivid/linux-fsl-imx51/vivid

« back to all changes in this revision

Viewing changes to arch/arm/mach-mx3/Makefile

  • Committer: Bazaar Package Importer
  • Author(s): Andy Whitcroft, Amit Kucheria, Andy Whitcroft, Bryan Wu, Upstream Kernel Changes
  • Date: 2010-01-11 16:26:27 UTC
  • Revision ID: james.westby@ubuntu.com-20100111162627-1q2fl9tcuwcywt1e
Tags: 2.6.31-602.4
[ Amit Kucheria ]

* Update to official 2.6.31 BSP release from Freescale

[ Andy Whitcroft ]

* drop a number of modules no longer built

[ Bryan Wu ]

* [Config] Update configs after applying .31 patchset from Freescale
* [Config] Sync with imx51_defconfig from Freescale BSP

[ Upstream Kernel Changes ]

* Update to official 2.6.31 BSP release from Freescale.

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/arm/mach-mx3/Makefile
4
4
 
5
5
# Object file lists.
6
6
 
7
 
obj-y                           := mm.o devices.o
8
 
obj-$(CONFIG_ARCH_MX31)         += clock.o iomux.o
9
 
obj-$(CONFIG_ARCH_MX35)         += clock-imx35.o
10
 
obj-$(CONFIG_MACH_MX31ADS)      += mx31ads.o
 
7
obj-y                   := system.o iomux.o cpu.o mm.o clock.o dptc.o devices.o serial.o dma.o mxc_pm.o dvfs_v2.o
 
8
obj-$(CONFIG_MACH_MX31ADS)      += mx31ads.o mx31ads_gpio.o
11
9
obj-$(CONFIG_MACH_MX31LILLY)    += mx31lilly.o mx31lilly-db.o
12
10
obj-$(CONFIG_MACH_MX31LITE)     += mx31lite.o
13
11
obj-$(CONFIG_MACH_PCM037)       += pcm037.o
14
12
obj-$(CONFIG_MACH_PCM037_EET)   += pcm037_eet.o
15
 
obj-$(CONFIG_MACH_MX31_3DS)     += mx31pdk.o
 
13
obj-$(CONFIG_MACH_MX31_3DS)     += mx3_3stack.o mx3_3stack_gpio.o mx3_3stack_pmic_mc13783.o
16
14
obj-$(CONFIG_MACH_MX31MOBOARD)  += mx31moboard.o mx31moboard-devboard.o \
17
15
                                   mx31moboard-marxbot.o
18
16
obj-$(CONFIG_MACH_QONG)         += qong.o
19
17
obj-$(CONFIG_MACH_PCM043)       += pcm043.o
20
18
obj-$(CONFIG_MACH_ARMADILLO5X0) += armadillo5x0.o
21
 
obj-$(CONFIG_MACH_MX35_3DS)     += mx35pdk.o
 
19
 
 
20
# power management
 
21
obj-$(CONFIG_PM)                += pm.o
 
22
 
 
23
obj-$(CONFIG_USB_EHCI_ARC_H1)   += usb_h1.o
 
24
obj-$(CONFIG_USB_EHCI_ARC_H2)   += usb_h2.o
 
25
 
 
26
ifneq ($(strip $(CONFIG_USB_GADGET_ARC) $(CONFIG_USB_EHCI_ARC_OTG)),)
 
27
        obj-y   += usb_dr.o
 
28
endif