From: Masahiro Yamada <yamada.m@jp.panasonic.com>
Date: Wed, 11 Dec 2013 01:00:08 +0000 (+0900)
Subject: spl/Makefile: merge LIBS-y += arch/$(ARCH)/imx-common
X-Git-Tag: v2014.01-rc2~23
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ba931259b10477f5cd2dd43b290d986335d506ba;p=oweals%2Fu-boot.git

spl/Makefile: merge LIBS-y += arch/$(ARCH)/imx-common

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---

diff --git a/spl/Makefile b/spl/Makefile
index b816e20efc..9b862be9a5 100644
--- a/spl/Makefile
+++ b/spl/Makefile
@@ -90,17 +90,13 @@ LIBS-$(CONFIG_SPL_MUSB_NEW_SUPPORT) += drivers/usb/musb-new/
 LIBS-$(CONFIG_SPL_USBETH_SUPPORT) += drivers/usb/gadget/
 LIBS-$(CONFIG_SPL_WATCHDOG_SUPPORT) += drivers/watchdog/
 
-ifneq (,$(CONFIG_MX23)$(filter $(SOC), mx25 mx27 mx5 mx6 mx31 mx35))
+ifneq (,$(CONFIG_MX23)$(CONFIG_MX35)$(filter $(SOC), mx25 mx27 mx5 mx6 mx31 mx35))
 LIBS-y += arch/$(ARCH)/imx-common/
 endif
 
 LIBS-$(CONFIG_ARM) += arch/arm/cpu/
 LIBS-$(CONFIG_PPC) += arch/powerpc/cpu/
 
-ifneq ($(CONFIG_MX23)$(CONFIG_MX35),)
-LIBS-y += arch/$(ARCH)/imx-common/
-endif
-
 LIBS-y := $(patsubst %/, %/built-in.o, $(LIBS-y))
 
 # Add GCC lib