diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-06-30 23:00:34 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-06-30 23:00:34 +0200 |
| commit | d6694aff569a0838a9d0ef352128f5aa309d73ff (patch) | |
| tree | a94eeab5431dfd0ed91a510c2e7de5eebb7a78fc /arch/arm/imx-common/Makefile | |
| parent | b5b8d85e9a50c2294b6043830cd045de1002dc5d (diff) | |
| parent | 3f4c01d9f9d38e383f004dcd06c0d5661f2a57e0 (diff) | |
| download | u-boot-imx-d6694aff569a0838a9d0ef352128f5aa309d73ff.zip u-boot-imx-d6694aff569a0838a9d0ef352128f5aa309d73ff.tar.gz u-boot-imx-d6694aff569a0838a9d0ef352128f5aa309d73ff.tar.bz2 | |
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/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile index 6c65577..25a9d4c 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 |