diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-09-14 09:59:08 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-09-15 09:23:43 +0200 |
| commit | 5e61dd3fb5506fe647f95deca95d97cced51aeb3 (patch) | |
| tree | 4e9c06b2421813fd906af1d1dfc6e8d711594578 | |
| parent | 679ded140710b6149fcd1c318d799fe91dd3cb30 (diff) | |
| download | barebox-5e61dd3fb5506fe647f95deca95d97cced51aeb3.tar.gz barebox-5e61dd3fb5506fe647f95deca95d97cced51aeb3.tar.xz | |
Add comp_copy function for use with CONFIG_IMAGE_COMPRESSION_NONE
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@pengutronix.de>
| -rw-r--r-- | arch/arm/pbl/Makefile | 2 | ||||
| -rw-r--r-- | images/Makefile | 2 | ||||
| -rw-r--r-- | scripts/Makefile.lib | 8 |
3 files changed, 10 insertions, 2 deletions
diff --git a/arch/arm/pbl/Makefile b/arch/arm/pbl/Makefile index 1ff39dbdfe..c45511261d 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 da9cc8d396..0537af1f6d 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 e55bc27789..e79998c1b9 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 $< > $@ |