From: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Date: Mon, 6 May 2013 01:15:48 +0000 (+0000)
Subject: imx: spl: Merge libimx-common make rules
X-Git-Tag: v2013.07-rc1~2^2~5^2~22
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=89a9fd5832aca6efc54c13fa1c30664c6ea02d51;p=u-boot

imx: spl: Merge libimx-common make rules

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

diff --git a/spl/Makefile b/spl/Makefile
index 8b655c485a..d8fe948ff0 100644
--- a/spl/Makefile
+++ b/spl/Makefile
@@ -88,7 +88,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))
+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 += arch/$(ARCH)/cpu/tegra-common/libcputegra-common.o
 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