On Mon, Apr 19, 2010 at 10:28:12AM +0200, Wolfram Sang wrote: > From: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx> > > As a side effect don't build barebox.S when barebox.bin is updated. I > didn't manage to keep the old behaviour and I consider it cleaner this > way. I don't understand this completely. We only need barebox.S updated when barebox is updated, not when barebox.bin is updated. Is this what you mean? Sascha > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx> > Signed-off-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx> > --- > > Passing it through, ask Uwe for details if needed. > > Makefile | 17 ++++++++++++++--- > 1 files changed, 14 insertions(+), 3 deletions(-) > > diff --git a/Makefile b/Makefile > index c92c5dd..5b4f964 100644 > --- a/Makefile > +++ b/Makefile > @@ -641,9 +641,16 @@ define rule_barebox-modpost > $(Q)echo 'cmd_$@ := $(cmd_barebox-modpost)' > $(dot-target).cmd > endef > > -barebox.bin: barebox > - $(Q)$(OBJCOPY) -O binary barebox barebox.bin > +quiet_cmd_objcopy = OBJCOPY $@ > + cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@ > + > +OBJCOPYFLAGS_barebox.bin = -O binary > + > +barebox.bin: barebox FORCE > + $(call if_changed,objcopy) > + > ifdef CONFIG_X86 > +barebox.S: barebox > ifdef CONFIG_X86_HDBOOT > @echo "-------------------------------------------------" > barebox.S > @echo " * MBR content" >> barebox.S > @@ -665,7 +672,11 @@ endif > @echo " * Init Calls content" >> barebox.S > $(Q)$(OBJDUMP) -j .barebox_initcalls -d barebox >> barebox.S > else > - $(Q)$(OBJDUMP) -d barebox > barebox.S > +quiet_cmd_disasm = DISASM $@ > + cmd_disasm = $(OBJDUMP) -d $< > $@ > + > +barebox.S: barebox FORCE > + $(call if_changed,disasm) > endif > > # barebox image > -- > 1.7.0 > > > _______________________________________________ > barebox mailing list > barebox@xxxxxxxxxxxxxxxxxxx > http://lists.infradead.org/mailman/listinfo/barebox -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
