diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-04-04 12:03:20 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-04-04 12:03:20 +0200 |
| commit | da718ca89d2a062bcb6047071c335eb19d028d78 (patch) | |
| tree | 7e735083ab07fe73e7d0f2306a7dd388478725dc /arch/arm/mach-imx/Makefile | |
| parent | 71e001324bbcc5cd27666cf82e8ce043bf7d342e (diff) | |
| parent | bb289922763b9b46ab617fcd1be4ad6a6856d4a4 (diff) | |
| download | barebox-da718ca89d2a062bcb6047071c335eb19d028d78.tar.gz barebox-da718ca89d2a062bcb6047071c335eb19d028d78.tar.xz | |
Merge branch 'for-next/imx-external-nand-boot'
Diffstat (limited to 'arch/arm/mach-imx/Makefile')
| -rw-r--r-- | arch/arm/mach-imx/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 4adf522219..dd58c6280b 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -16,4 +16,5 @@ obj-$(CONFIG_COMMON_CLK) += clk-pllv1.o clk-pllv2.o clk-pllv3.o clk-pfd.o 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 pbl-y += esdctl.o |