summaryrefslogtreecommitdiffstats
path: root/spl
diff options
context:
space:
mode:
authorBenoît Thébaudeau <benoit.thebaudeau@advansee.com>2013-05-06 01:15:48 +0000
committerStefano Babic <sbabic@denx.de>2013-05-16 17:44:45 +0200
commit89a9fd5832aca6efc54c13fa1c30664c6ea02d51 (patch)
treee4bc64a938347f578619c096edbdb6da53e953ab /spl
parentcac423a730d3506154744485af1bbc1cd3a1e6a8 (diff)
downloadblackbird-obmc-uboot-89a9fd5832aca6efc54c13fa1c30664c6ea02d51.tar.gz
blackbird-obmc-uboot-89a9fd5832aca6efc54c13fa1c30664c6ea02d51.zip
imx: spl: Merge libimx-common make rules
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Diffstat (limited to 'spl')
-rw-r--r--spl/Makefile6
1 files changed, 1 insertions, 5 deletions
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
OpenPOWER on IntegriCloud