diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-05-24 22:20:40 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-05-25 15:11:31 +0200 |
| commit | 6d9809f1eb7ced7fc36b5d65daea4addf412e353 (patch) | |
| tree | 5941c2bdd29b201c82a09f599785569dcc5ce6ae | |
| parent | fa49b39bb4e9a9c4c730684c733b42bfba90f8ba (diff) | |
| download | barebox-6d9809f1eb7ced7fc36b5d65daea4addf412e353.tar.gz barebox-6d9809f1eb7ced7fc36b5d65daea4addf412e353.tar.xz | |
ARM: pbl: fix make dependencies
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>
| -rw-r--r-- | arch/arm/Makefile | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index d506b1210c..9bfa2c7c52 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) |