Patchwork [U-Boot,v4,5/9] arm: adjust PLATFORM_LIBS for SPL

login
register
mail settings
Submitter Daniel Schwierzeck
Date July 19, 2011, 3:51 p.m.
Message ID <1311090701-11801-1-git-send-email-daniel.schwierzeck@googlemail.com>
Download mbox | patch
Permalink /patch/105482/
State Accepted
Commit 5253418a77bb389d9fb272323adb9b7e5e7e99cf
Headers show

Comments

Daniel Schwierzeck - July 19, 2011, 3:51 p.m.
From: Aneesh V <aneesh@ti.com>

Signed-off-by: Aneesh V <aneesh@ti.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
---
Changes since RFC v1:
- none

Changes since RFC v2:
- none

Changes since v3:
- improved comment

 arch/arm/config.mk |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)
Aneesh V - July 20, 2011, 7:59 a.m.
Dear Wolfgang,

On Tuesday 19 July 2011 09:21 PM, Daniel Schwierzeck wrote:
> From: Aneesh V<aneesh@ti.com>
>
> Signed-off-by: Aneesh V<aneesh@ti.com>
> Cc: Albert ARIBAUD<albert.u.boot@aribaud.net>
> ---
> Changes since RFC v1:
> - none
>
> Changes since RFC v2:
> - none
>
> Changes since v3:
> - improved comment

I think this was the final change requested. Will you be pulling this
now?
Wolfgang Denk - July 26, 2011, 12:44 p.m.
Dear Daniel Schwierzeck,

In message <1311090701-11801-1-git-send-email-daniel.schwierzeck@googlemail.com> you wrote:
> From: Aneesh V <aneesh@ti.com>
> 
> Signed-off-by: Aneesh V <aneesh@ti.com>
> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
> ---
> Changes since RFC v1:
> - none
> 
> Changes since RFC v2:
> - none
> 
> Changes since v3:
> - improved comment
> 
>  arch/arm/config.mk |   13 ++++++++++---
>  1 files changed, 10 insertions(+), 3 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Patch

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