From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Schwierzeck Date: Mon, 18 Jul 2011 18:09:17 +0200 Subject: [U-Boot] [PATCH v3 5/9] arm: adjust PLATFORM_LIBS for SPL In-Reply-To: <1311005361-26241-1-git-send-email-daniel.schwierzeck@googlemail.com> References: <1310569869-31810-1-git-send-email-daniel.schwierzeck@googlemail.com> <1311005361-26241-1-git-send-email-daniel.schwierzeck@googlemail.com> Message-ID: <1311005361-26241-6-git-send-email-daniel.schwierzeck@googlemail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de From: Aneesh V Signed-off-by: Aneesh V Cc: Albert ARIBAUD --- Changes since RFC v1: - none arch/arm/config.mk | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/arch/arm/config.mk b/arch/arm/config.mk index 788d4c1..9184d06 100644 --- a/arch/arm/config.mk +++ b/arch/arm/config.mk @@ -56,9 +56,14 @@ 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 several times, with or without CONFIG_SPL_BUILD set +# Make sure to add only once and with the correct prefix +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 -- 1.7.6