summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2013-12-11 10:00:08 +0900
committerTom Rini <trini@ti.com>2013-12-13 09:17:18 -0500
commitba931259b10477f5cd2dd43b290d986335d506ba (patch)
tree888a800ada6ed512d65f27b3f90625b52e53ebcf
parent6b44adc22e6f4cc4fe8e1bb6c69b6bf8ec8da533 (diff)
downloadu-boot-imx-ba931259b10477f5cd2dd43b290d986335d506ba.zip
u-boot-imx-ba931259b10477f5cd2dd43b290d986335d506ba.tar.gz
u-boot-imx-ba931259b10477f5cd2dd43b290d986335d506ba.tar.bz2
spl/Makefile: merge LIBS-y += arch/$(ARCH)/imx-common
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
-rw-r--r--spl/Makefile6
1 files changed, 1 insertions, 5 deletions
diff --git a/spl/Makefile b/spl/Makefile
index b816e20..9b862be 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