diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-01-11 19:05:11 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-01-12 07:13:47 +0100 |
commit | dcedcec3751d3307e42b2a6583186b2a39f2076d (patch) | |
tree | 3defe034003c9025c1caf6ce71ac5568e2abf832 /arch/arm/mach-imx/Makefile | |
parent | 08c62ae2fa9378732588ef7b9a9120b377d26d1e (diff) | |
parent | 1b2cc689fc2db0db56c617e789906a684b22097a (diff) | |
download | barebox-dcedcec3751d3307e42b2a6583186b2a39f2076d.tar.gz barebox-dcedcec3751d3307e42b2a6583186b2a39f2076d.tar.xz |
Merge branch 'for-next/vybrid'
Diffstat (limited to 'arch/arm/mach-imx/Makefile')
-rw-r--r-- | arch/arm/mach-imx/Makefile | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index ee839f7443..d0fe7abc00 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -1,26 +1,23 @@ obj-y += clocksource.o -obj-$(CONFIG_ARCH_IMX1) += imx1.o clk-imx1.o -obj-$(CONFIG_ARCH_IMX25) += imx25.o clk-imx25.o -obj-$(CONFIG_ARCH_IMX21) += imx21.o clk-imx21.o -obj-$(CONFIG_ARCH_IMX27) += imx27.o clk-imx27.o -obj-$(CONFIG_ARCH_IMX31) += imx31.o clk-imx31.o -obj-$(CONFIG_ARCH_IMX35) += imx35.o clk-imx35.o -obj-$(CONFIG_ARCH_IMX50) += imx50.o imx5.o clk-imx5.o +obj-$(CONFIG_ARCH_IMX1) += imx1.o +obj-$(CONFIG_ARCH_IMX25) += imx25.o +obj-$(CONFIG_ARCH_IMX21) += imx21.o +obj-$(CONFIG_ARCH_IMX27) += imx27.o +obj-$(CONFIG_ARCH_IMX31) += imx31.o +obj-$(CONFIG_ARCH_IMX35) += imx35.o +obj-$(CONFIG_ARCH_IMX50) += imx50.o imx5.o pbl-$(CONFIG_ARCH_IMX50) += imx50.o imx5.o -obj-$(CONFIG_ARCH_IMX51) += imx51.o imx5.o clk-imx5.o +obj-$(CONFIG_ARCH_IMX51) += imx51.o imx5.o pbl-$(CONFIG_ARCH_IMX51) += imx51.o imx5.o -obj-$(CONFIG_ARCH_IMX53) += imx53.o imx5.o clk-imx5.o esdctl-v4.o +obj-$(CONFIG_ARCH_IMX53) += imx53.o imx5.o esdctl-v4.o pbl-$(CONFIG_ARCH_IMX53) += imx53.o imx5.o esdctl-v4.o -obj-$(CONFIG_ARCH_IMX6) += imx6.o usb-imx6.o clk-imx6.o +obj-$(CONFIG_ARCH_IMX6) += imx6.o usb-imx6.o lwl-$(CONFIG_ARCH_IMX6) += imx6-mmdc.o -obj-$(CONFIG_ARCH_IMX6SX) += clk-imx6sx.o -obj-$(CONFIG_ARCH_IMX6UL) += clk-imx6ul.o obj-$(CONFIG_ARCH_IMX_XLOAD) += xload.o obj-$(CONFIG_IMX_IIM) += iim.o obj-$(CONFIG_IMX_OCOTP) += ocotp.o obj-$(CONFIG_NAND_IMX) += nand.o lwl-$(CONFIG_ARCH_IMX_EXTERNAL_BOOT_NAND) += external-nand-boot.o -obj-$(CONFIG_COMMON_CLK) += clk-pllv1.o clk-pllv2.o clk-pllv3.o clk-pfd.o clk-gate2.o clk-gate-exclusive.o obj-y += devices.o imx.o obj-pbl-y += esdctl.o boot.o obj-$(CONFIG_BAREBOX_UPDATE) += imx-bbu-internal.o |