diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-07-03 08:37:36 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-07-03 08:37:36 +0200 |
| commit | c5438404db8c8fecff2cd9791b8e0debe679f0d7 (patch) | |
| tree | f9aceef1c34073fbf00e3bf9a17ab126b6362fbb /arch/arm/mach-imx/Makefile | |
| parent | e5ed4bea79282a629ac688daddbdd21d991e1d35 (diff) | |
| parent | 6ab66787fc15a286b6142b09f9d7c2654dee78a9 (diff) | |
| download | barebox-c5438404db8c8fecff2cd9791b8e0debe679f0d7.tar.gz barebox-c5438404db8c8fecff2cd9791b8e0debe679f0d7.tar.xz | |
Merge branch 'for-next/imx-bbu-nand-fcb'
Conflicts:
common/Kconfig
Diffstat (limited to 'arch/arm/mach-imx/Makefile')
| -rw-r--r-- | arch/arm/mach-imx/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 0320d1c2ea..458d7b45bb 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -22,6 +22,5 @@ obj-y += devices.o imx.o esdctl.o obj-y += boot.o obj-$(CONFIG_BAREBOX_UPDATE) += imx-bbu-internal.o obj-$(CONFIG_BAREBOX_UPDATE_IMX_EXTERNAL_NAND) += imx-bbu-external-nand.o -obj-$(CONFIG_BAREBOX_UPDATE_IMX6_NAND) += imx6-bbu-nand.o pbl-y += esdctl.o lwl-y += cpu_init.o |