The Makefile compression commands all append the size of the uncompressed image. With CONFIG_IMAGE_COMPRESSION_NONE simply 'shipped' is used which does not append the size. Add and use a special comp_copy function which adds the size. This helps us to get the uncompressed image size in the startup code later. Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> --- arch/arm/pbl/Makefile | 2 +- images/Makefile | 2 +- scripts/Makefile.lib | 8 ++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/arch/arm/pbl/Makefile b/arch/arm/pbl/Makefile index 1ff39db..c455112 100644 --- a/arch/arm/pbl/Makefile +++ b/arch/arm/pbl/Makefile @@ -3,7 +3,7 @@ suffix_$(CONFIG_IMAGE_COMPRESSION_GZIP) = gzip suffix_$(CONFIG_IMAGE_COMPRESSION_LZO) = lzo suffix_$(CONFIG_IMAGE_COMPRESSION_LZ4) = lz4 suffix_$(CONFIG_IMAGE_COMPRESSION_XZKERN) = xzkern -suffix_$(CONFIG_IMAGE_COMPRESSION_NONE) = shipped +suffix_$(CONFIG_IMAGE_COMPRESSION_NONE) = comp_copy OBJCOPYFLAGS_zbarebox.bin = -O binary piggy_o := piggy.$(suffix_y).o diff --git a/images/Makefile b/images/Makefile index da9cc8d..0537af1 100644 --- a/images/Makefile +++ b/images/Makefile @@ -85,7 +85,7 @@ suffix_$(CONFIG_IMAGE_COMPRESSION_GZIP) = gzip suffix_$(CONFIG_IMAGE_COMPRESSION_LZO) = lzo suffix_$(CONFIG_IMAGE_COMPRESSION_LZ4) = lz4 suffix_$(CONFIG_IMAGE_COMPRESSION_XZKERN) = xzkern -suffix_$(CONFIG_IMAGE_COMPRESSION_NONE) = shipped +suffix_$(CONFIG_IMAGE_COMPRESSION_NONE) = comp_copy # barebox.z - compressed barebox binary # ---------------------------------------------------------------- diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index e55bc27..e79998c 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -380,6 +380,14 @@ cmd_lz4 = (cat $(filter-out FORCE,$^) | \ %.lz4: % $(call if_changed,lz4) +# comp_copy +# --------------------------------------------------------------------------- +# Wrapper which only copies a file, but compatible to the compression +# functions above. Appends the size to the result file +quiet_cmd_comp_copy ?= SHIPPED_S $@ +cmd_comp_copy ?= cat $(filter-out FORCE,$^) > $@; \ + $(call size_append, $(filter-out FORCE,$^)) >> $@ + quiet_cmd_disasm = DISASM $@ cmd_disasm = $(OBJDUMP) -d $< > $@ -- 2.8.1 _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
