diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-09-05 12:59:29 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-09-05 12:59:29 +0200 |
commit | bed1a6ffab6ba8f59146af07ccbdc7a625b6496f (patch) | |
tree | 6301a84dc2ef2d746a9a60979573e03eb6cc1c6a /arch/arm/mach-imx/Makefile | |
parent | b40aeb00d32f07c5b1b617ea4e88032cb895d8b3 (diff) | |
parent | d5b6012ac1e674e7ce285d6b47cd346d765267d0 (diff) | |
download | barebox-bed1a6ffab6ba8f59146af07ccbdc7a625b6496f.tar.gz barebox-bed1a6ffab6ba8f59146af07ccbdc7a625b6496f.tar.xz |
Merge branch 'for-next/pbl'
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 7b872f6da3..2b595bce43 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -13,6 +13,7 @@ obj-$(CONFIG_IMX_CLKO) += clko.o obj-$(CONFIG_IMX_IIM) += iim.o obj-$(CONFIG_NAND_IMX) += nand.o obj-$(CONFIG_ARCH_IMX_EXTERNAL_BOOT_NAND) += external-nand-boot.o +pbl-$(CONFIG_ARCH_IMX_EXTERNAL_BOOT_NAND) += external-nand-boot.o obj-y += speed.o obj-y += devices.o obj-y += boot.o |