commit 89a9fd5832aca6efc54c13fa1c30664c6ea02d51
author Benoît Thébaudeau <benoit.thebaudeau@advansee.com> Mon May 06 01:15:48 2013 +0000
committer Stefano Babic <sbabic@denx.de> Thu May 16 17:44:45 2013 +0200
tree e4bc64a938347f578619c096edbdb6da53e953ab
parent cac423a730d3506154744485af1bbc1cd3a1e6a8

imx: spl: Merge libimx-common make rules

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>

spl/Makefile

diff --git a/spl/Makefile b/spl/Makefile
index 8b655c4..d8fe948 100644
--- a/spl/Makefile
+++ b/spl/Makefile
@@ -88,7 +88,7 @@
 LIBS-y += $(CPUDIR)/omap-common/libomap-common.o
 endif
 
-ifneq (,$(filter $(SOC), mx25 mx27 mx5 mx6 mx31 mx35))
+ifneq (,$(CONFIG_MX23)$(filter $(SOC), mx25 mx27 mx5 mx6 mx31 mx35))
 LIBS-y += arch/$(ARCH)/imx-common/libimx-common.o
 endif
 
@@ -98,10 +98,6 @@
 LIBS-y += $(CPUDIR)/tegra-common/libtegra-common.o
 endif
 
-ifneq ($(CONFIG_MX23)$(CONFIG_MX35),)
-LIBS-y += arch/$(ARCH)/imx-common/libimx-common.o
-endif
-
 # Add GCC lib
 ifeq ("$(USE_PRIVATE_LIBGCC)", "yes")
 PLATFORM_LIBGCC = $(SPLTREE)/arch/$(ARCH)/lib/libgcc.o