summaryrefslogtreecommitdiff
path: root/spl
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-06-19 12:53:59 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-06-19 12:53:59 +0200
commit69f14dc2fd64307f012381dd333a06001dec75dc (patch)
tree1c520dfb9afd8406230a5382ebaf57b0b8cd6c5d /spl
parent847e6693ccb529bf8346db62876f38f0c4e04ade (diff)
parented7bdc03eb516fb698ccc12ec5b4b9f132d05c5f (diff)
downloadu-boot-imx-69f14dc2fd64307f012381dd333a06001dec75dc.zip
u-boot-imx-69f14dc2fd64307f012381dd333a06001dec75dc.tar.gz
u-boot-imx-69f14dc2fd64307f012381dd333a06001dec75dc.tar.bz2
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
Conflicts: spl/Makefile
Diffstat (limited to 'spl')
-rw-r--r--spl/Makefile8
1 files changed, 8 insertions, 0 deletions
diff --git a/spl/Makefile b/spl/Makefile
index d8fe948..01873de 100644
--- a/spl/Makefile
+++ b/spl/Makefile
@@ -98,6 +98,14 @@ 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
+
+ifeq ($(SOC),exynos)
+LIBS-y += $(CPUDIR)/s5p-common/libs5p-common.o
+endif
+
# Add GCC lib
ifeq ("$(USE_PRIVATE_LIBGCC)", "yes")
PLATFORM_LIBGCC = $(SPLTREE)/arch/$(ARCH)/lib/libgcc.o