Hi Albert, On Tuesday 19 July 2011 02:51 PM, Albert ARIBAUD wrote: > Hi Daniel / Aneesh, > > Le 18/07/2011 18:09, Daniel Schwierzeck a écrit : >> From: Aneesh V<ane...@ti.com> >> >> Signed-off-by: Aneesh V<ane...@ti.com> >> Cc: Albert ARIBAUD<albert.u.b...@aribaud.net> >> --- >> 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
How about something like this: # 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 > > Seems like the two issues of parsing several times and of parsing with > or without SPL are independent, so please rephrase the comment to > clearly separate both points; and as for the "make sure... several > times" point, please change comment to point the reader to the use of > filter-out (i.e., one should read "making sure that... by using > 'filter-out'"). filter-out helps to avoid both problems. best regards, Aneesh _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
