mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
To: Sascha Hauer <s.hauer@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH 5/9] ARM: fix netx/MLO/s5p image build for pbl
Date: Sat, 11 Aug 2012 11:37:02 +0200	[thread overview]
Message-ID: <20120811093702.GB6271@game.jcrosoft.org> (raw)
In-Reply-To: <1344628865-32574-6-git-send-email-s.hauer@pengutronix.de>

On 22:01 Fri 10 Aug     , Sascha Hauer wrote:
> If pbl support is enabled only zbarebox.bin was built, but
> not the SoC specific images. Fix this.
yeah it does the trick but I do not like the makefile target
we need to create cmd and use the $(call xxx,ifchanged) mecanism

Best Regards,
J.
> 
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
>  arch/arm/Makefile |   35 ++++++++++++++++++++++-------------
>  1 file changed, 22 insertions(+), 13 deletions(-)
> 
> diff --git a/arch/arm/Makefile b/arch/arm/Makefile
> index 89f645b..63bc9be 100644
> --- a/arch/arm/Makefile
> +++ b/arch/arm/Makefile
> @@ -160,7 +160,16 @@ CPPFLAGS += -fdata-sections -ffunction-sections
>  LDFLAGS_barebox += -static --gc-sections
>  endif
>  
> -barebox.netx: barebox.bin
> +ifdef CONFIG_IMAGE_COMPRESSION
> +KBUILD_BINARY := arch/arm/pbl/zbarebox.bin
> +KBUILD_TARGET := zbarebox.bin
> +$(KBUILD_BINARY): $(KBUILD_TARGET)
> +else
> +KBUILD_BINARY := barebox.bin
> +KBUILD_TARGET := barebox.bin
> +endif
> +
> +barebox.netx: $(KBUILD_BINARY)
>  	$(Q)scripts/gen_netx_image -i $< -o barebox.netx		\
>  		--sdramctrl=$(CONFIG_NETX_SDRAM_CTRL)			\
>  		--sdramtimctrl=$(CONFIG_NETX_SDRAM_TIMING_CTRL)		\
> @@ -169,36 +178,36 @@ barebox.netx: barebox.bin
>  		--cookie=$(CONFIG_NETX_COOKIE);
>  
>  ifeq ($(machine-y),netx)
> -KBUILD_IMAGE := barebox.netx
> +KBUILD_TARGET := barebox.netx
> +KBUILD_BINARY := $(KBUILD_TARGET)
>  endif
>  
> -barebox.s5p: barebox.bin
> +barebox.s5p: $(KBUILD_BINARY)
>  	$(Q)scripts/s5p_cksum $< barebox.s5p
>  
>  ifeq ($(CONFIG_ARCH_S5PCxx),y)
> -KBUILD_IMAGE := barebox.s5p
> +KBUILD_TARGET := barebox.s5p
> +KBUILD_BINARY := $(KBUILD_TARGET)
>  endif
>  
> -MLO: barebox.bin
> +MLO: $(KBUILD_BINARY)
>  	@echo "  IFT    " $@
>  	$(Q)scripts/omap_signGP $< $(TEXT_BASE) 1
>  	$(Q)test -e $<.ift && mv $<.ift MLO
>  
>  ifeq ($(CONFIG_OMAP_BUILD_IFT),y)
> -KBUILD_IMAGE := MLO
> +KBUILD_TARGET := MLO
> +KBUILD_BINARY := $(KBUILD_TARGET)
>  endif
>  
> -barebox.ubl: barebox.bin
> +barebox.ubl: $(KBUILD_BINARY)
>  	@echo "  UBL    " $@
>  	$(Q)scripts/mkublheader $< > barebox.ubl
>  	$(Q)cat $< >> barebox.ubl
>  
>  ifeq ($(CONFIG_ARCH_DAVINCI),y)
> -KBUILD_IMAGE := barebox.ubl
> -endif
> -
> -ifdef CONFIG_IMAGE_COMPRESSION
> -KBUILD_IMAGE := zbarebox.bin
> +KBUILD_TARGET := barebox.ubl
> +KBUILD_BINARY := $(KBUILD_TARGET)
>  endif
>  
>  pbl := arch/arm/pbl
> @@ -208,7 +217,7 @@ zbarebox.S zbarebox.bin zbarebox: barebox.bin
>  archclean:
>  	$(MAKE) $(clean)=$(pbl)
>  
> -all: $(KBUILD_IMAGE)
> +all: $(KBUILD_BINARY)
>  
>  archprepare: maketools
>  maketools:
> -- 
> 1.7.10.4
> 

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  reply	other threads:[~2012-08-11  9:37 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-10 20:00 [PATCH] pbl updates Sascha Hauer
2012-08-10 20:00 ` [PATCH 1/9] ARM eukrea cpuimx25: Move flash_header to seperate file Sascha Hauer
2012-08-10 20:00 ` [PATCH 2/9] ARM s3c boards: Do not hardcode image sizes Sascha Hauer
2012-08-10 20:00 ` [PATCH 3/9] ARM boards: Make boards pbl safe Sascha Hauer
2012-08-10 20:01 ` [PATCH 4/9] ARM Makefile: Do not hardcode targets in MLO/netx/davinci/s5p Sascha Hauer
2012-08-10 20:01 ` [PATCH 5/9] ARM: fix netx/MLO/s5p image build for pbl Sascha Hauer
2012-08-11  9:37   ` Jean-Christophe PLAGNIOL-VILLARD [this message]
2012-08-12 12:09     ` Sascha Hauer
2012-08-12 13:21       ` Jean-Christophe PLAGNIOL-VILLARD
2012-08-10 20:01 ` [PATCH 6/9] ARM Makefile: generate a barebox-flash-image link Sascha Hauer
2012-08-11  9:37   ` Jean-Christophe PLAGNIOL-VILLARD
2012-08-12 13:23     ` Jean-Christophe PLAGNIOL-VILLARD
2012-08-10 20:01 ` [PATCH 7/9] ARM pbl: Fix zbarebox.S build Sascha Hauer
2012-08-11  9:38   ` Jean-Christophe PLAGNIOL-VILLARD
2012-08-10 20:01 ` [PATCH 8/9] ARM pbl: remove unnecessary FORCE Sascha Hauer
2012-08-11  9:39   ` Jean-Christophe PLAGNIOL-VILLARD
2012-08-12 12:36     ` Sascha Hauer
2012-08-12 13:24       ` Jean-Christophe PLAGNIOL-VILLARD
2012-08-10 20:01 ` [PATCH 9/9] ARM pbl: generate zbarebox.map in $(obj) Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120811093702.GB6271@game.jcrosoft.org \
    --to=plagnioj@jcrosoft.com \
    --cc=barebox@lists.infradead.org \
    --cc=s.hauer@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox