[PATCH] scripts: imx-image: fix iMX35 header generation

[PATCH] scripts: imx-image: fix iMX35 header generation

[Alexander Kurz]

From: Alexander Kurz <akurz@blala.de>

Two header copies exist in the iMX35 image.
When writing the barebox_header, also write it to the second copy.

Signed-off-by: Alexander Kurz <akurz@blala.de>
---
 scripts/imx/imx-image.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/imx/imx-image.c b/scripts/imx/imx-image.c
index f5e89d07a..6cbee1d9b 100644
--- a/scripts/imx/imx-image.c
+++ b/scripts/imx/imx-image.c
@@ -984,8 +984,11 @@ int main(int argc, char *argv[])
 		xwrite(outfd, buf, header_len);
 	}
 
-	if (add_barebox_header)
+	if (add_barebox_header) {
 		pwrite(outfd, bb_header, sizeof_bb_header, 0);
+		if (data.cpu_type == IMX_CPU_IMX35)
+			pwrite(outfd, bb_header, sizeof_bb_header, header_len);
+	}
 
 	xwrite(outfd, infile, insize);
 
-- 
2.20.1


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

Re: [PATCH] scripts: imx-image: fix iMX35 header generation

[Sascha Hauer]

On Fri, Mar 05, 2021 at 08:04:22PM +0000, Alexander Kurz wrote:
> From: Alexander Kurz <akurz@blala.de>
> 
> Two header copies exist in the iMX35 image.
> When writing the barebox_header, also write it to the second copy.
> 
> Signed-off-by: Alexander Kurz <akurz@blala.de>
> ---
>  scripts/imx/imx-image.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)

Applied, thanks

It was likely me who broke this, Sorry for that.

Sascha

> diff --git a/scripts/imx/imx-image.c b/scripts/imx/imx-image.c
> index f5e89d07a..6cbee1d9b 100644
> --- a/scripts/imx/imx-image.c
> +++ b/scripts/imx/imx-image.c
> @@ -984,8 +984,11 @@ int main(int argc, char *argv[])
>  		xwrite(outfd, buf, header_len);
>  	}
>  
> -	if (add_barebox_header)
> +	if (add_barebox_header) {
>  		pwrite(outfd, bb_header, sizeof_bb_header, 0);
> +		if (data.cpu_type == IMX_CPU_IMX35)
> +			pwrite(outfd, bb_header, sizeof_bb_header, header_len);
> +	}
>  
>  	xwrite(outfd, infile, insize);
>  
> -- 
> 2.20.1
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
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