[PATCH] Make dependency fixes

[PATCH] Make dependency fixes

[Sascha Hauer]

Hi All,

The following are some fixes to the make dependencies. On ARM with
PBL enabled the SoC specific images (MLO, ubl) were not rebuilt:

make				<- generates MLO
touch common/console.c
make				<- MLO is not rebuilt

OTOH with PBL enabled the zbarebox.bin was rebuilt everytime even
when nothing has changed.

This and two other things are fixed in this series.

Sascha

----------------------------------------------------------------
Sascha Hauer (4):
      pbl: Fix typo in make causing pbl files to be rebuilt
      ARM: pbl: fix make dependencies
      make: Add barebox_default_env.* to targets
      ARM: zynq: Add cmd to generate zynq image

 arch/arm/Makefile      | 20 +++++++-------------
 common/Makefile        |  2 ++
 scripts/Makefile.build |  2 +-
 3 files changed, 10 insertions(+), 14 deletions(-)

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

[PATCH 1/4] pbl: Fix typo in make causing pbl files to be rebuilt

[Sascha Hauer]

We had pbl_cc__o_c instead of pbl_cc_o_c. This caused all pbl object
files to be rebuilt everytime due to missing .cmd file.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 scripts/Makefile.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index a95bbe4..4ef2c56 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -233,7 +233,7 @@ define rule_pbl_cc_o_c
 	$(call echo-cmd,checksrc) $(cmd_checksrc)			  \
 	$(call echo-cmd,pbl_cc_o_c) $(cmd_pbl_cc_o_c);			  \
 	$(cmd_modversions)						  \
-	scripts/basic/fixdep $(depfile) $@ '$(call make-cmd,pbl_cc__o_c)' >    \
+	scripts/basic/fixdep $(depfile) $@ '$(call make-cmd,pbl_cc_o_c)' >    \
 	                                              $(dot-target).tmp;  \
 	rm -f $(depfile);						  \
 	mv -f $(dot-target).tmp $(dot-target).cmd
-- 
1.8.2.rc2


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

[PATCH 2/4] ARM: pbl: fix make dependencies

[Sascha Hauer]

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

[PATCH 3/4] make: Add barebox_default_env.* to targets

[Sascha Hauer]

Otherwise it gets rebuilt everytime.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 common/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/Makefile b/common/Makefile
index 9460172..2f0bd34 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -102,6 +102,8 @@ $(obj)/barebox_default_env.bz2: $(obj)/barebox_default_env FORCE
 $(obj)/barebox_default_env.lzo: $(obj)/barebox_default_env FORCE
 	$(call if_changed,lzo)
 
+targets += barebox_default_env.lzo barebox_default_env.bz2 barebox_default_env.gz
+
 quiet_cmd_env_h = ENVH    $@
 cmd_env_h = cat $< | (cd $(obj) && $(objtree)/scripts/bin2c default_environment) > $@; \
 	echo "const int default_environment_uncompress_size=`stat -c%s $(obj)/barebox_default_env`;" >> $@
-- 
1.8.2.rc2


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

[PATCH 4/4] ARM: zynq: Add cmd to generate zynq image

[Sascha Hauer]

Add a command to generate the zynq image instead of generating it
directly. This causes a rebuild exactly when necessary and prints
a "ZYNQ-IMG" to the commandline during compilation.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 9bfa2c7..90a4713 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -246,8 +246,11 @@ ifeq ($(CONFIG_OMAP_BUILD_SPI),y)
 KBUILD_IMAGE := barebox.spi
 endif
 
-barebox.zynq: $(KBUILD_BINARY)
-	$(Q)scripts/zynq_mkimage $< $@
+quiet_cmd_zynq_image = ZYNQ-IMG $@
+      cmd_zynq_image = scripts/zynq_mkimage $< $@
+
+barebox.zynq: $(KBUILD_BINARY) FORCE
+	$(call if_changed,zynq_image)
 
 ifeq ($(machine-y),zynq)
 KBUILD_IMAGE := barebox.zynq
-- 
1.8.2.rc2


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