diff mbox

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

Message ID 1386723608-8781-1-git-send-email-yamada.m@jp.panasonic.com
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Masahiro Yamada Dec. 11, 2013, 1 a.m. UTC 
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---
 spl/Makefile | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

Comments

Tom Rini Dec. 16, 2013, 2:16 p.m. UTC | #1 
On Wed, Dec 11, 2013 at 10:00:08AM +0900, Masahiro Yamada wrote:

> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> 
> ---
> spl/Makefile | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/spl/Makefile b/spl/Makefile
index 2a787af..25f8b3c 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