mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH v2 1/8] imx-image: Correctly fill image size in prepended header
Date: Mon, 4 May 2015 09:41:10 +0200	[thread overview]
Message-ID: <20150504074110.GQ6325@pengutronix.de> (raw)
In-Reply-To: <1430690125-2257-1-git-send-email-andrew.smirnov@gmail.com>

It seems you only resent the patches from this series you actually
changed. Could you resent *all* patches again next time?

Sascha

On Sun, May 03, 2015 at 02:55:22PM -0700, Andrey Smirnov wrote:
> If called with '-b' option 'imx-image' tool prepends barebox header to
> the image, but the tool does not fill the data at image size offset
> correctly. Fix that.
> 
> Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
> ---
> 
> This patch supercedes the one sent earlier titled:
>  "[PATCH 1/8] Makefile.lib: Fix i.MX image size after generation"
> 
>  scripts/imx/Makefile    |  2 ++
>  scripts/imx/imx-image.c | 12 ++++++++++--
>  2 files changed, 12 insertions(+), 2 deletions(-)
> 
> diff --git a/scripts/imx/Makefile b/scripts/imx/Makefile
> index be0b490..ee0acc1 100644
> --- a/scripts/imx/Makefile
> +++ b/scripts/imx/Makefile
> @@ -6,5 +6,7 @@ always          := $(hostprogs-y)
>  HOSTCFLAGS_imx-usb-loader.o = `pkg-config --cflags libusb-1.0`
>  HOSTLOADLIBES_imx-usb-loader  = `pkg-config --libs libusb-1.0`
> 
> +HOSTCFLAGS_imx-image.o = -I$(srctree)
> +
>  imx-usb-loader-objs := imx-usb-loader.o
>  imx-image-objs := imx-image.o
> diff --git a/scripts/imx/imx-image.c b/scripts/imx/imx-image.c
> index 25ea4d8..c0181df 100644
> --- a/scripts/imx/imx-image.c
> +++ b/scripts/imx/imx-image.c
> @@ -27,6 +27,8 @@
>  #include <fcntl.h>
>  #include <endian.h>
> 
> +#include <include/filetype.h>
> +
>  #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
>  #define offsetof(TYPE, MEMBER) __builtin_offsetof(TYPE, MEMBER)
>  #define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y))
> @@ -92,8 +94,11 @@ static int add_header_v1(void *buf, int offset, uint32_t loadaddr, uint32_t imag
>  	struct imx_flash_header *hdr;
>  	int dcdsize = curdcd * sizeof(uint32_t);
> 
> -	if (add_barebox_header)
> +	if (add_barebox_header) {
> +		uint32_t *psize = buf + ARM_HEAD_SIZE_OFFSET;
>  		memcpy(buf, bb_header, sizeof(bb_header));
> +		*psize = imagesize;
> +	}
> 
>  	buf += offset;
>  	hdr = buf;
> @@ -178,8 +183,11 @@ static int add_header_v2(void *buf, int offset, uint32_t loadaddr, uint32_t imag
>  	struct imx_flash_header_v2 *hdr;
>  	int dcdsize = curdcd * sizeof(uint32_t);
> 
> -	if (add_barebox_header)
> +	if (add_barebox_header) {
> +		uint32_t *psize = buf + ARM_HEAD_SIZE_OFFSET;
>  		memcpy(buf, bb_header, sizeof(bb_header));
> +		*psize = imagesize;
> +	}
> 
>  	buf += offset;
>  	hdr = buf;
> --
> 2.1.4
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> 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@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

      parent reply	other threads:[~2015-05-04  7:41 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-03 21:55 Andrey Smirnov
2015-05-03 21:55 ` [PATCH v2 3/8] bootstrap_read_devfs(): Check for errors from devfs_add_partition() Andrey Smirnov
2015-05-03 21:55 ` [PATCH v2 5/8] bootstrap_read_devfs(): Fix potential memory leak Andrey Smirnov
2015-05-03 21:55 ` [PATCH v2 7/8] bootstrap_read_devfs(): Remove all partitions upon function completion Andrey Smirnov
2015-05-03 22:05 ` [PATCH v2 1/8] imx-image: Correctly fill image size in prepended header Marc Kleine-Budde
     [not found]   ` <CAHQ1cqEoL1PD4Cg7G52YvosXmsmcg1jckGL9-65_J-=qHc3XvA@mail.gmail.com>
2015-05-03 22:34     ` Marc Kleine-Budde
2015-05-04  7:41 ` Sascha Hauer [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150504074110.GQ6325@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=andrew.smirnov@gmail.com \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox