| Message ID | 1315800204-19705-2-git-send-email-marek.vasut@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
Dear Marek Vasut, In message <1315800204-19705-2-git-send-email-marek.vasut@gmail.com> you wrote: > Introduce CONFIG_SPL_START_S_PATH to configure path to start.S file. It's not > always fitting to use CPU's start.S . > > Signed-off-by: Marek Vasut <marek.vasut@gmail.com> > Cc: Stefano Babic <sbabic@denx.de> > Cc: Wolfgang Denk <wd@denx.de> > Cc: Detlev Zundel <dzu@denx.de> > Cc: Chander Kashyap <chander.kashyap@linaro.org> > --- > spl/Makefile | 10 ++++++++-- > 1 files changed, 8 insertions(+), 2 deletions(-) Applied, thanks. Best regards, Wolfgang Denk
Dear Wolfgang Denk, In message <20111005190852.9AD2B18E5B48@gemini.denx.de> you wrote: > Dear Marek Vasut, > > In message <1315800204-19705-2-git-send-email-marek.vasut@gmail.com> you wrote: > > Introduce CONFIG_SPL_START_S_PATH to configure path to start.S file. It's not > > always fitting to use CPU's start.S . > > > > Signed-off-by: Marek Vasut <marek.vasut@gmail.com> > > Cc: Stefano Babic <sbabic@denx.de> > > Cc: Wolfgang Denk <wd@denx.de> > > Cc: Detlev Zundel <dzu@denx.de> > > Cc: Chander Kashyap <chander.kashyap@linaro.org> > > --- > > spl/Makefile | 10 ++++++++-- > > 1 files changed, 8 insertions(+), 2 deletions(-) > > Applied, thanks. No sorry, I backjed out this commit again. It causes compile warnings, for example: running MAKEALL TQM860L Configuring for TQM860L board... aisimage.c: In function 'ais_insert_cmd_header': aisimage.c:183:11: warning: variable 'len_cmd' set but not used [-Wunused-but-set-variable] 5bf222bcf7889c73771b291dbfda6be2567a915d is the first bad commit commit 5bf222bcf7889c73771b291dbfda6be2567a915d Author: Marek Vasut <marek.vasut@gmail.com> Date: Sun Sep 11 17:56:19 2011 +0000 SPL: Make path to start.S configurable Best regards, Wolfgang Denk
Dear Marek, In message <20111005200736.8FCE418E5B48@gemini.denx.de> you wrote: > > No sorry, I backjed out this commit again. It causes compile > warnings, for example: > > running MAKEALL TQM860L > Configuring for TQM860L board... > aisimage.c: In function 'ais_insert_cmd_header': > aisimage.c:183:11: warning: variable 'len_cmd' set but not used [-Wunused-but-set-variable] oops. Sorry, false alarm. We cannot use "git bisect run MAKEALL" when only wanrings are issued :-( Looking manually for the real culprit. Best regards, Wolfgang Denk
diff --git a/spl/Makefile b/spl/Makefile index 95ecce1..56d8ea1 100644 --- a/spl/Makefile +++ b/spl/Makefile @@ -26,7 +26,13 @@ obj := $(OBJTREE)/spl/ HAVE_VENDOR_COMMON_LIB := $(shell [ -f $(SRCTREE)/board/$(VENDOR)/common/Makefile ] \ && echo y || echo n) -START := $(CPUDIR)/start.o +ifdef CONFIG_SPL_START_S_PATH +START_PATH := $(subst ",,$(CONFIG_SPL_START_S_PATH)) +else +START_PATH := $(CPUDIR) +endif + +START := $(START_PATH)/start.o LIBS-y += arch/$(ARCH)/lib/lib$(ARCH).o LIBS-y += $(CPUDIR)/lib$(CPU).o @@ -119,7 +125,7 @@ $(obj)u-boot-spl: depend $(START) $(LIBS) $(obj)u-boot-spl.lds $(GEN_UBOOT) $(START): depend - $(MAKE) -C $(SRCTREE)/$(CPUDIR) $@ + $(MAKE) -C $(SRCTREE)/$(START_PATH) $@ $(LIBS): depend $(MAKE) -C $(SRCTREE)$(dir $(subst $(SPLTREE),,$@))
Introduce CONFIG_SPL_START_S_PATH to configure path to start.S file. It's not always fitting to use CPU's start.S . Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Wolfgang Denk <wd@denx.de> Cc: Detlev Zundel <dzu@denx.de> Cc: Chander Kashyap <chander.kashyap@linaro.org> --- spl/Makefile | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-)