Patchwork [U-Boot] imx: spl: Merge libimx-common make rules

login
register
mail settings
Submitter Benoît Thébaudeau
Date May 6, 2013, 11:15 a.m.
Message ID <1367838948-20351-1-git-send-email-benoit.thebaudeau@advansee.com>
Download mbox | patch
Permalink /patch/241619/
State Awaiting Upstream
Delegated to: Stefano Babic
Headers show

Comments

Benoît Thébaudeau - May 6, 2013, 11:15 a.m.
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
---
 spl/Makefile |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
Stefano Babic - May 16, 2013, 3:46 p.m.
On 06/05/2013 13:15, Benoît Thébaudeau wrote:
> Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
> ---

Applied to u-boot-imx, thanks.

Best regards,
Stefano Babic

Patch

diff --git a/spl/Makefile b/spl/Makefile
index 8b655c4..d8fe948 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