diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-06-08 14:35:10 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-06-08 14:35:10 +0200 |
| commit | 10e167329b029890a4c704f094822da5f259b886 (patch) | |
| tree | c0950b7cb928ee26b07c39348e4539602ce3aec9 /Makefile | |
| parent | dbc000bfb51eb30d786521e6b8e29048c36cbefa (diff) | |
| parent | 4a1c7b13ae104d4526d3176793b7f6b06694df15 (diff) | |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Conflicts:
drivers/serial/Makefile
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -341,7 +341,7 @@ ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP34XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(C LIBS-y += $(CPUDIR)/omap-common/libomap-common.o endif -ifneq (,$(filter $(SOC), mx25 mx27 mx5 mx6 mx31 mx35 mxs)) +ifneq (,$(filter $(SOC), mx25 mx27 mx5 mx6 mx31 mx35 mxs vf610)) LIBS-y += arch/$(ARCH)/imx-common/libimx-common.o endif |