diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2018-12-31 09:07:22 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-01-03 10:05:23 +0100 |
commit | 64fc4ac1b50a06b17a72c7427e797b3a33a30e8c (patch) | |
tree | 5f6d4620a771b244a723b351f6a8fad88af5b42b /images | |
parent | 3abeee3e45224c73245e32cb614c241cd195f1c4 (diff) | |
download | barebox-64fc4ac1b50a06b17a72c7427e797b3a33a30e8c.tar.gz barebox-64fc4ac1b50a06b17a72c7427e797b3a33a30e8c.tar.xz |
images: fix force rebuild of piggy.o
piggy.o would be build for every time barebox was built
This had the sideeffect that the image(s) would
always be rebuilt despite no changes
Fix this by adding piggy.o to targets
and avoid an extra command in the rule to create .pblb files
The patch includes the removal of a stray assignment
Fixes: 5a1a5ed253 ("ARM: images: use piggydata")
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'images')
-rw-r--r-- | images/Makefile | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/images/Makefile b/images/Makefile index 41509aa957..c4b2a483fb 100644 --- a/images/Makefile +++ b/images/Makefile @@ -43,7 +43,9 @@ # quiet_cmd_objcopy_bin = OBJCOPYB $@ - cmd_objcopy_bin = $(OBJCOPY) -O binary $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@ + cmd_objcopy_bin = \ + $(OBJCOPY) -O binary $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@ && \ + $(objtree)/scripts/fix_size -f $@ pbl-lds := $(obj)/pbl.lds extra-y += $(pbl-lds) @@ -59,14 +61,11 @@ quiet_cmd_elf__ ?= LD $@ PBL_CPPFLAGS += -fdata-sections -ffunction-sections -piggy_o := piggy.$(suffix_y).o - $(obj)/%.pbl: $(pbl-lds) $(barebox-pbl-common) $(obj)/piggy.o FORCE $(call if_changed,elf__,$(*F)) $(obj)/%.pblb: $(obj)/%.pbl FORCE $(call if_changed,objcopy_bin,$(*F)) - $(Q)$(objtree)/scripts/fix_size -f $@ $(obj)/%.s: $(obj)/% FORCE $(call if_changed,disasm) @@ -106,7 +105,7 @@ include $(srctree)/images/Makefile.tegra include $(srctree)/images/Makefile.vexpress include $(srctree)/images/Makefile.at91 -targets += $(image-y) pbl.lds barebox.x barebox.z +targets += $(image-y) pbl.lds barebox.x barebox.z piggy.o targets += $(patsubst %,%.pblb,$(pblb-y)) targets += $(patsubst %,%.pbl,$(pblb-y)) targets += $(patsubst %,%.s,$(pblb-y)) |