cecb9a1e4d
- All imx53 board files are removed by the equal device tree support - The efikamx board files are removed to ease device tree migration - Remove dummy pinctrl state by setting up pinctrl in device tree -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQEcBAABAgAGBQJQTvkKAAoJEFBXWFqHsHzOQvMIALgz2rEVpFWBvZTtH3oKc/iZ L2xK0cZ5BDDb0BhH/2v6BpMW2fXrag815W58gwKmM/e2WvK6BRKlEtddaYN2DvYA EXHesgUUehkWsUP29lhQO0SBOJPkEGUZ1m2DF1i5/6gENwLw3bVdd9Q+4Z271nxP TtXDyqjOmTjHXXfKo3r4PzDUcJoI5jgZpEzkBBZmGQKu5l9n8jb53F5v6dkecRa/ EaKRRhmn6aOc7e9NcsD1KowqRIHQMNI1emmjo46vTQlH+/pyD8SjQoz1GVXy8RGo 8uAnhf/aT5kX3JEvCxkJs9CDYavlfpueJ1/90klX6H60BScMzynA88RJtB2NlFE= =dkqZ -----END PGP SIGNATURE----- Merge tag 'imx-dt-3.7' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt - All imx53 board files are removed by the equal device tree support - The efikamx board files are removed to ease device tree migration - Remove dummy pinctrl state by setting up pinctrl in device tree * tag 'imx-dt-3.7' of git://git.linaro.org/people/shawnguo/linux-2.6: (28 commits) ARM: imx6q-sabrelite: Rename 'pinctrl_gpio_hog' ARM: imx51: decouple device tree boot from board files ARM: imx51: build in pinctrl support ARM: dts: imx51-babbage: add pinctrl settings ARM: imx53: remove unneeded files and functions ARM: imx53: support device tree boot only ARM: imx53: decouple device tree boot from board files ARM: imx53: build in pinctrl support ARM: dts: imx53-smd: add pinctrl settings ARM: dts: imx53-evk: add pinctrl settings ARM: dts: imx53-ard: add pinctrl settings ARM: dts: imx53-qsb: add pinctrl settings ARM: imx6q: remove dummy pinctrl state ARM: dts: imx6q-sabresd: add pinctrl settings ARM: dts: imx6q-arm2: add pinctrl for uart and enet ARM: dts: imx6q-sabrelite: add pinctrl for usdhc and enet ARM: dts: imx6q: sort iomuxc sub-nodes in name ARM: dts: imx6q: name iomuxc sub-nodes following pin function ARM: dts: imx6q: improve indentation for fsl,pins ARM: efikamx: remove Genesi Efika MX platform files from the tree ... Resolved trivial context conflict in arch/arm/boot/dts/imx51-babbage.dts
92 lines
3.6 KiB
Makefile
92 lines
3.6 KiB
Makefile
obj-$(CONFIG_SOC_IMX1) += clk-imx1.o mm-imx1.o
|
|
obj-$(CONFIG_SOC_IMX21) += clk-imx21.o mm-imx21.o
|
|
|
|
obj-$(CONFIG_SOC_IMX25) += clk-imx25.o mm-imx25.o ehci-imx25.o cpu-imx25.o
|
|
|
|
obj-$(CONFIG_SOC_IMX27) += cpu-imx27.o pm-imx27.o
|
|
obj-$(CONFIG_SOC_IMX27) += clk-imx27.o mm-imx27.o ehci-imx27.o
|
|
|
|
obj-$(CONFIG_SOC_IMX31) += mm-imx3.o cpu-imx31.o clk-imx31.o iomux-imx31.o ehci-imx31.o pm-imx3.o
|
|
obj-$(CONFIG_SOC_IMX35) += mm-imx3.o cpu-imx35.o clk-imx35.o ehci-imx35.o pm-imx3.o
|
|
|
|
imx5-pm-$(CONFIG_PM) += pm-imx5.o
|
|
obj-$(CONFIG_SOC_IMX5) += cpu-imx5.o mm-imx5.o clk-imx51-imx53.o ehci-imx5.o $(imx5-pm-y) cpu_op-mx51.o
|
|
|
|
obj-$(CONFIG_COMMON_CLK) += clk-pllv1.o clk-pllv2.o clk-pllv3.o clk-gate2.o \
|
|
clk-pfd.o clk-busy.o
|
|
|
|
# Support for CMOS sensor interface
|
|
obj-$(CONFIG_MX1_VIDEO) += mx1-camera-fiq.o mx1-camera-fiq-ksym.o
|
|
|
|
# i.MX1 based machines
|
|
obj-$(CONFIG_ARCH_MX1ADS) += mach-mx1ads.o
|
|
obj-$(CONFIG_MACH_SCB9328) += mach-scb9328.o
|
|
obj-$(CONFIG_MACH_APF9328) += mach-apf9328.o
|
|
|
|
# i.MX21 based machines
|
|
obj-$(CONFIG_MACH_MX21ADS) += mach-mx21ads.o
|
|
|
|
# i.MX25 based machines
|
|
obj-$(CONFIG_MACH_MX25_3DS) += mach-mx25_3ds.o
|
|
obj-$(CONFIG_MACH_EUKREA_CPUIMX25SD) += mach-eukrea_cpuimx25.o
|
|
obj-$(CONFIG_MACH_EUKREA_MBIMXSD25_BASEBOARD) += eukrea_mbimxsd25-baseboard.o
|
|
|
|
# i.MX27 based machines
|
|
obj-$(CONFIG_MACH_MX27ADS) += mach-mx27ads.o
|
|
obj-$(CONFIG_MACH_PCM038) += mach-pcm038.o
|
|
obj-$(CONFIG_MACH_PCM970_BASEBOARD) += pcm970-baseboard.o
|
|
obj-$(CONFIG_MACH_MX27_3DS) += mach-mx27_3ds.o
|
|
obj-$(CONFIG_MACH_IMX27LITE) += mach-imx27lite.o
|
|
obj-$(CONFIG_MACH_IMX27_VISSTRIM_M10) += mach-imx27_visstrim_m10.o
|
|
obj-$(CONFIG_MACH_CPUIMX27) += mach-cpuimx27.o
|
|
obj-$(CONFIG_MACH_EUKREA_MBIMX27_BASEBOARD) += eukrea_mbimx27-baseboard.o
|
|
obj-$(CONFIG_MACH_PCA100) += mach-pca100.o
|
|
obj-$(CONFIG_MACH_MXT_TD60) += mach-mxt_td60.o
|
|
obj-$(CONFIG_MACH_IMX27IPCAM) += mach-imx27ipcam.o
|
|
obj-$(CONFIG_MACH_IMX27_DT) += imx27-dt.o
|
|
|
|
# i.MX31 based machines
|
|
obj-$(CONFIG_MACH_MX31ADS) += mach-mx31ads.o
|
|
obj-$(CONFIG_MACH_MX31LILLY) += mach-mx31lilly.o mx31lilly-db.o
|
|
obj-$(CONFIG_MACH_MX31LITE) += mach-mx31lite.o mx31lite-db.o
|
|
obj-$(CONFIG_MACH_PCM037) += mach-pcm037.o
|
|
obj-$(CONFIG_MACH_PCM037_EET) += mach-pcm037_eet.o
|
|
obj-$(CONFIG_MACH_MX31_3DS) += mach-mx31_3ds.o
|
|
obj-$(CONFIG_MACH_MX31MOBOARD) += mach-mx31moboard.o mx31moboard-devboard.o \
|
|
mx31moboard-marxbot.o mx31moboard-smartbot.o
|
|
obj-$(CONFIG_MACH_QONG) += mach-qong.o
|
|
obj-$(CONFIG_MACH_ARMADILLO5X0) += mach-armadillo5x0.o
|
|
obj-$(CONFIG_MACH_KZM_ARM11_01) += mach-kzm_arm11_01.o
|
|
obj-$(CONFIG_MACH_BUG) += mach-bug.o
|
|
obj-$(CONFIG_MACH_IMX31_DT) += imx31-dt.o
|
|
|
|
# i.MX35 based machines
|
|
obj-$(CONFIG_MACH_PCM043) += mach-pcm043.o
|
|
obj-$(CONFIG_MACH_MX35_3DS) += mach-mx35_3ds.o
|
|
obj-$(CONFIG_MACH_EUKREA_CPUIMX35SD) += mach-cpuimx35.o
|
|
obj-$(CONFIG_MACH_EUKREA_MBIMXSD35_BASEBOARD) += eukrea_mbimxsd35-baseboard.o
|
|
obj-$(CONFIG_MACH_VPR200) += mach-vpr200.o
|
|
|
|
obj-$(CONFIG_DEBUG_LL) += lluart.o
|
|
obj-$(CONFIG_HAVE_IMX_GPC) += gpc.o
|
|
obj-$(CONFIG_HAVE_IMX_MMDC) += mmdc.o
|
|
obj-$(CONFIG_HAVE_IMX_SRC) += src.o
|
|
AFLAGS_headsmp.o :=-Wa,-march=armv7-a
|
|
obj-$(CONFIG_SMP) += headsmp.o platsmp.o
|
|
obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
|
|
obj-$(CONFIG_SOC_IMX6Q) += clk-imx6q.o mach-imx6q.o
|
|
|
|
ifeq ($(CONFIG_PM),y)
|
|
obj-$(CONFIG_SOC_IMX6Q) += pm-imx6q.o headsmp.o
|
|
endif
|
|
|
|
# i.MX5 based machines
|
|
obj-$(CONFIG_MACH_MX51_BABBAGE) += mach-mx51_babbage.o
|
|
obj-$(CONFIG_MACH_MX51_3DS) += mach-mx51_3ds.o
|
|
obj-$(CONFIG_MACH_EUKREA_CPUIMX51SD) += mach-cpuimx51sd.o
|
|
obj-$(CONFIG_MACH_EUKREA_MBIMXSD51_BASEBOARD) += eukrea_mbimxsd51-baseboard.o
|
|
obj-$(CONFIG_MACH_MX50_RDP) += mach-mx50_rdp.o
|
|
|
|
obj-$(CONFIG_MACH_IMX51_DT) += imx51-dt.o
|
|
obj-$(CONFIG_SOC_IMX53) += mach-imx53.o
|