From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 2/4] ARM: pbl: fix make dependencies
Date: Sat, 25 May 2013 15:32:19 +0200 [thread overview]
Message-ID: <1369488741-4313-3-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1369488741-4313-1-git-send-email-s.hauer@pengutronix.de>
The pbl used 'zbarebox.bin' as target instead of the real file. This
lead to strange effects that the images depending on zbarebox.bin were
only built every second time. This uses the full path as target.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/Makefile | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index d506b12..9bfa2c7 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -190,11 +190,8 @@ endif
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)
@@ -206,7 +203,6 @@ barebox.netx: $(KBUILD_BINARY)
--cookie=$(CONFIG_NETX_COOKIE);
ifeq ($(machine-y),netx)
-KBUILD_TARGET := barebox.netx
KBUILD_IMAGE := barebox.netx
endif
@@ -214,7 +210,6 @@ barebox.s5p: $(KBUILD_BINARY)
$(Q)scripts/s5p_cksum $< barebox.s5p
ifeq ($(CONFIG_ARCH_S5PCxx),y)
-KBUILD_TARGET := barebox.s5p
KBUILD_IMAGE := barebox.s5p
endif
@@ -226,7 +221,6 @@ MLO: $(KBUILD_BINARY)
$(call if_changed,mlo)
ifeq ($(CONFIG_OMAP_BUILD_IFT),y)
-KBUILD_TARGET := MLO
KBUILD_IMAGE := MLO
endif
@@ -239,7 +233,6 @@ barebox.ubl: $(KBUILD_BINARY) FORCE
$(call if_changed,davinci_ubl_image)
ifeq ($(CONFIG_ARCH_DAVINCI),y)
-KBUILD_TARGET := barebox.ubl
KBUILD_IMAGE := barebox.ubl
endif
@@ -250,7 +243,6 @@ barebox.spi: $(KBUILD_BINARY) FORCE
$(call if_changed,am35xx_spi_image)
ifeq ($(CONFIG_OMAP_BUILD_SPI),y)
-KBUILD_TARGET := barebox.spi
KBUILD_IMAGE := barebox.spi
endif
@@ -258,13 +250,12 @@ barebox.zynq: $(KBUILD_BINARY)
$(Q)scripts/zynq_mkimage $< $@
ifeq ($(machine-y),zynq)
-KBUILD_TARGET := barebox.zynq
KBUILD_IMAGE := barebox.zynq
endif
pbl := arch/arm/pbl
-zbarebox.S zbarebox.bin zbarebox: barebox.bin
- $(Q)$(MAKE) $(build)=$(pbl) $(pbl)/$@
+$(pbl)/zbarebox.S $(pbl)/zbarebox.bin $(pbl)/zbarebox: barebox.bin
+ $(Q)$(MAKE) $(build)=$(pbl) $@
archclean:
$(MAKE) $(clean)=$(pbl)
--
1.8.2.rc2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2013-05-25 13:32 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-25 13:32 [PATCH] Make dependency fixes Sascha Hauer
2013-05-25 13:32 ` [PATCH 1/4] pbl: Fix typo in make causing pbl files to be rebuilt Sascha Hauer
2013-05-25 13:32 ` Sascha Hauer [this message]
2013-05-25 13:32 ` [PATCH 3/4] make: Add barebox_default_env.* to targets Sascha Hauer
2013-05-25 13:32 ` [PATCH 4/4] ARM: zynq: Add cmd to generate zynq image 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=1369488741-4313-3-git-send-email-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
/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