diff options
| author | Tom Rini <trini@konsulko.com> | 2015-11-16 08:35:38 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-11-16 08:35:38 -0500 |
| commit | 98e73c834467ef6f1d3e9a8102745e16b3128ac1 (patch) | |
| tree | a73931f3865dea561750d6a738dbd1738ba8c666 /arch/arm/imx-common/Makefile | |
| parent | 618a51e9aefe1e03f498ea48bfab70a0b2c9be39 (diff) | |
| parent | ec26c1eef735befb7011c24e08e6310ab6dc9be6 (diff) | |
| download | talos-obmc-uboot-98e73c834467ef6f1d3e9a8102745e16b3128ac1.tar.gz talos-obmc-uboot-98e73c834467ef6f1d3e9a8102745e16b3128ac1.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'arch/arm/imx-common/Makefile')
| -rw-r--r-- | arch/arm/imx-common/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile index 1698d061e7..e7190c3fbc 100644 --- a/arch/arm/imx-common/Makefile +++ b/arch/arm/imx-common/Makefile @@ -14,7 +14,7 @@ ifeq ($(SOC),$(filter $(SOC),mx5 mx6)) obj-y += timer.o cpu.o speed.o obj-$(CONFIG_SYS_I2C_MXC) += i2c-mxv7.o endif -ifeq ($(SOC),$(filter $(SOC),mx6 mxs)) +ifeq ($(SOC),$(filter $(SOC),mx7 mx6 mxs)) obj-y += misc.o obj-$(CONFIG_SPL_BUILD) += spl.o endif @@ -27,6 +27,7 @@ ifeq ($(SOC),$(filter $(SOC),mx6 mx7)) obj-y += cache.o init.o obj-$(CONFIG_CMD_SATA) += sata.o obj-$(CONFIG_IMX_VIDEO_SKIP) += video.o +obj-$(CONFIG_SECURE_BOOT) += hab.o endif ifeq ($(SOC),$(filter $(SOC),vf610)) obj-y += ddrmc-vf610.o |
