summaryrefslogtreecommitdiffstats
path: root/spl
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-02-24 20:44:14 +0900
committerTom Rini <trini@ti.com>2014-02-24 10:56:33 -0500
commit6445262ca8d0400def05c4ef8e2b8e8424929599 (patch)
treeb03610e44273b15f20c08e54c872c3ca9fa2ed41 /spl
parent61fcc7d2757bc5d6bf52739e4fc7132b5fa84efe (diff)
downloadblackbird-obmc-uboot-6445262ca8d0400def05c4ef8e2b8e8424929599.tar.gz
blackbird-obmc-uboot-6445262ca8d0400def05c4ef8e2b8e8424929599.zip
kbuild: fix SPL link bug when USE_PRIVATE_LIBGCC is "yes"
Commit 6825a95 (kbuild: use Linux Kernel build scripts) changed the behavior of linkage when USE_PRIAVATE_LIBGCC is defined as "yes". (It dropped arch/arm/lib/eabi_compat.o from the target library.) Affected boards are all Tegra boards. This commit gets back the same behavior as before Kbuild series. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Tom Warren <twarren@nvidia.com> Cc: Tom Rini <trini@ti.com>
Diffstat (limited to 'spl')
-rw-r--r--spl/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/spl/Makefile b/spl/Makefile
index bf980249eb..9d3d1822f1 100644
--- a/spl/Makefile
+++ b/spl/Makefile
@@ -133,7 +133,8 @@ libs-y := $(patsubst %/, %/built-in.o, $(libs-y))
# Add GCC lib
ifeq ("$(USE_PRIVATE_LIBGCC)", "yes")
-PLATFORM_LIBS := $(SPLTREE)/arch/$(ARCH)/lib/lib.a
+PLATFORM_LIBGCC = $(SPLTREE)/arch/$(ARCH)/lib/lib.a
+PLATFORM_LIBS := $(filter-out %/lib.a, $(filter-out -lgcc, $(PLATFORM_LIBS))) $(PLATFORM_LIBGCC)
endif
u-boot-spl-init := $(head-y)
OpenPOWER on IntegriCloud