diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-09-21 00:26:19 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-09-21 00:26:19 +0200 |
| commit | d193c1b6eb05041c94ad9aacd8c94189d1dbc5f8 (patch) | |
| tree | c08012d3c427142364bca40e042659b3a819c60a /Makefile | |
| parent | 651eb7322407173d5f1ac5a149e381a4044858f4 (diff) | |
| parent | 1d9b033269263a69f7402f508c17b242fc7fea43 (diff) | |
| download | u-boot-d193c1b6eb05041c94ad9aacd8c94189d1dbc5f8.tar.gz | |
Merge remote-tracking branch 'u-boot-imx/master'
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -306,11 +306,8 @@ ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP34XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),) LIBS-y += $(CPUDIR)/omap-common/libomap-common.o endif -ifeq ($(SOC),mx5) -LIBS-y += $(CPUDIR)/imx-common/libimx-common.o -endif -ifeq ($(SOC),mx6) -LIBS-y += $(CPUDIR)/imx-common/libimx-common.o +ifneq (,$(filter $(SOC), mx25 mx27 mx5 mx6 mx31 mx35)) +LIBS-y += arch/$(ARCH)/imx-common/libimx-common.o endif ifeq ($(SOC),s5pc1xx) @@ -776,6 +773,7 @@ clean: $(obj)tools/gen_eth_addr $(obj)tools/img2srec \ $(obj)tools/mk{env,}image $(obj)tools/mpc86x_clk \ $(obj)tools/mk{smdk5250,}spl \ + $(obj)tools/mxsboot \ $(obj)tools/ncb $(obj)tools/ubsha1 @rm -f $(obj)board/cray/L1/{bootscript.c,bootscript.image} \ $(obj)board/matrix_vision/*/bootscript.img \ |