summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAneesh V <aneesh@ti.com>2011-07-19 05:51:41 +0000
committerWolfgang Denk <wd@denx.de>2011-07-26 14:43:48 +0200
commit5253418a77bb389d9fb272323adb9b7e5e7e99cf (patch)
treeec80aaf29c79bddb2afaddc352f1a0c0c26c0f94
parent5df2ee27db5409e03b540fc54894961a2c4e637a (diff)
downloadu-boot-imx-5253418a77bb389d9fb272323adb9b7e5e7e99cf.zip
u-boot-imx-5253418a77bb389d9fb272323adb9b7e5e7e99cf.tar.gz
u-boot-imx-5253418a77bb389d9fb272323adb9b7e5e7e99cf.tar.bz2
arm: adjust PLATFORM_LIBS for SPL
Signed-off-by: Aneesh V <aneesh@ti.com> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
-rw-r--r--arch/arm/config.mk13
1 files changed, 10 insertions, 3 deletions
diff --git a/arch/arm/config.mk b/arch/arm/config.mk
index 788d4c1..9b4e581 100644
--- a/arch/arm/config.mk
+++ b/arch/arm/config.mk
@@ -56,9 +56,16 @@ PLATFORM_CPPFLAGS += $(call cc-option,\
# For EABI, make sure to provide raise()
ifneq (,$(findstring -mabi=aapcs-linux,$(PLATFORM_CPPFLAGS)))
-# This file is parsed several times; make sure to add only once.
-ifeq (,$(findstring arch/arm/lib/eabi_compat.o,$(PLATFORM_LIBS)))
-PLATFORM_LIBS += $(OBJTREE)/arch/arm/lib/eabi_compat.o
+# This file is parsed many times, so the string may get added multiple
+# times. Also, the prefix needs to be different based on whether
+# CONFIG_SPL_BUILD is defined or not. 'filter-out' the existing entry
+# before adding the correct one.
+ifdef CONFIG_SPL_BUILD
+PLATFORM_LIBS := $(SPLTREE)/arch/arm/lib/eabi_compat.o \
+ $(filter-out %/arch/arm/lib/eabi_compat.o, $(PLATFORM_LIBS))
+else
+PLATFORM_LIBS := $(OBJTREE)/arch/arm/lib/eabi_compat.o \
+ $(filter-out %/arch/arm/lib/eabi_compat.o, $(PLATFORM_LIBS))
endif
endif