mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH] images: Drop unnecessary fix_size
@ 2019-01-16  9:17 Sascha Hauer
  2019-01-16 11:01 ` Sam Ravnborg
  0 siblings, 1 reply; 3+ messages in thread
From: Sascha Hauer @ 2019-01-16  9:17 UTC (permalink / raw)
  To: Barebox List

Now that we compile the compressed binary into the decompressor we
no longer need fix_size but can use the linker to fill in the image
size into the binary.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/lib/pbl.lds.S | 2 +-
 images/Makefile        | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/arm/lib/pbl.lds.S b/arch/arm/lib/pbl.lds.S
index 53c9ce0fe6..e7a94f912e 100644
--- a/arch/arm/lib/pbl.lds.S
+++ b/arch/arm/lib/pbl.lds.S
@@ -95,6 +95,6 @@ SECTIONS
 
 	.image_end : { *(.__image_end) }
 
-	_barebox_image_size = __image_end - BASE;
+	_barebox_image_size = __piggydata_end - BASE;
 	_barebox_pbl_size = __bss_start - BASE;
 }
diff --git a/images/Makefile b/images/Makefile
index 9bd3caa578..aaf7479a70 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -44,8 +44,7 @@
 
 quiet_cmd_objcopy_bin = OBJCOPYB $@
       cmd_objcopy_bin = \
-		$(OBJCOPY) -O binary $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@ && \
-		$(objtree)/scripts/fix_size -f $@
+		$(OBJCOPY) -O binary $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@
 
 pbl-lds := $(obj)/pbl.lds
 extra-y += $(pbl-lds)
-- 
2.20.1


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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] images: Drop unnecessary fix_size
  2019-01-16  9:17 [PATCH] images: Drop unnecessary fix_size Sascha Hauer
@ 2019-01-16 11:01 ` Sam Ravnborg
  2019-01-17  8:39   ` Sascha Hauer
  0 siblings, 1 reply; 3+ messages in thread
From: Sam Ravnborg @ 2019-01-16 11:01 UTC (permalink / raw)
  To: Sascha Hauer; +Cc: Barebox List

Hi Sascha.

On Wed, Jan 16, 2019 at 10:17:27AM +0100, Sascha Hauer wrote:
> Now that we compile the compressed binary into the decompressor we
> no longer need fix_size but can use the linker to fill in the image
> size into the binary.
> 
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
>  arch/arm/lib/pbl.lds.S | 2 +-
>  images/Makefile        | 3 +--
>  2 files changed, 2 insertions(+), 3 deletions(-)

This patch drops the sole user of fix_size.
Should it be ditched from barebox or do we keep it just-in-case?

If ditched from barebox remember to update .gitignore

	Sam

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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] images: Drop unnecessary fix_size
  2019-01-16 11:01 ` Sam Ravnborg
@ 2019-01-17  8:39   ` Sascha Hauer
  0 siblings, 0 replies; 3+ messages in thread
From: Sascha Hauer @ 2019-01-17  8:39 UTC (permalink / raw)
  To: Sam Ravnborg; +Cc: Barebox List

On Wed, Jan 16, 2019 at 12:01:52PM +0100, Sam Ravnborg wrote:
> Hi Sascha.
> 
> On Wed, Jan 16, 2019 at 10:17:27AM +0100, Sascha Hauer wrote:
> > Now that we compile the compressed binary into the decompressor we
> > no longer need fix_size but can use the linker to fill in the image
> > size into the binary.
> > 
> > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> > ---
> >  arch/arm/lib/pbl.lds.S | 2 +-
> >  images/Makefile        | 3 +--
> >  2 files changed, 2 insertions(+), 3 deletions(-)
> 
> This patch drops the sole user of fix_size.
> Should it be ditched from barebox or do we keep it just-in-case?

I kept it around intentionally in case we need it later. I think we can
remove it in a few releases though.

Sascha


-- 
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@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2019-01-17  8:39 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-16  9:17 [PATCH] images: Drop unnecessary fix_size Sascha Hauer
2019-01-16 11:01 ` Sam Ravnborg
2019-01-17  8:39   ` Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox