summaryrefslogtreecommitdiffstats
path: root/arch/arm/imx-common/Makefile
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-06-30 23:00:34 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-06-30 23:00:34 +0200
commitd6694aff569a0838a9d0ef352128f5aa309d73ff (patch)
treea94eeab5431dfd0ed91a510c2e7de5eebb7a78fc /arch/arm/imx-common/Makefile
parentb5b8d85e9a50c2294b6043830cd045de1002dc5d (diff)
parent3f4c01d9f9d38e383f004dcd06c0d5661f2a57e0 (diff)
downloadtalos-obmc-uboot-d6694aff569a0838a9d0ef352128f5aa309d73ff.tar.gz
talos-obmc-uboot-d6694aff569a0838a9d0ef352128f5aa309d73ff.zip
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/imx-common/Makefile')
-rw-r--r--arch/arm/imx-common/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile
index 6c655773e8..25a9d4ce12 100644
--- a/arch/arm/imx-common/Makefile
+++ b/arch/arm/imx-common/Makefile
@@ -16,6 +16,7 @@ obj-$(CONFIG_SYS_I2C_MXC) += i2c-mxv7.o
endif
ifeq ($(SOC),$(filter $(SOC),mx6 mxs))
obj-y += misc.o
+obj-$(CONFIG_SPL_BUILD) += spl.o
endif
ifeq ($(SOC),$(filter $(SOC),mx6))
obj-$(CONFIG_CMD_SATA) += sata.o
OpenPOWER on IntegriCloud