mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH 1/1] scripts: imx-image: Fix image size in flash header for i.MX35
@ 2016-04-13  7:36 Alexander Stein
  2016-04-14  5:58 ` Sascha Hauer
  0 siblings, 1 reply; 2+ messages in thread
From: Alexander Stein @ 2016-04-13  7:36 UTC (permalink / raw)
  To: barebox; +Cc: Daniel Krueger, Alexander Stein

The i.MX35 needs additional 0x1000 byte. This quirk moved to the wrong
location during refactoring of imx-image for v2016.03.0.

Fixes: adade597593442 ""scripts: imx: Allow to create signed images")
Signed-off-by: Daniel Krueger <daniel.krueger@systec-electronic.com>
Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
---
 scripts/imx/imx.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/imx/imx.c b/scripts/imx/imx.c
index 82ef97f..ca65389 100644
--- a/scripts/imx/imx.c
+++ b/scripts/imx/imx.c
@@ -221,6 +221,10 @@ static int do_soc(struct config_data *data, int argc, char *argv[])
 		if (!strcmp(socs[i].name, soc)) {
 			data->header_version = socs[i].header_version;
 			data->cpu_type = socs[i].cpu_type;
+
+			if (data->cpu_type == 35)
+				data->load_size += HEADER_LEN;
+
 			return 0;
 		}
 	}
@@ -230,9 +234,6 @@ static int do_soc(struct config_data *data, int argc, char *argv[])
 		fprintf(stderr, "%s ", socs[i].name);
 	fprintf(stderr, "\n");
 
-	if (data->cpu_type == 35)
-		data->load_size += HEADER_LEN;
-
 	return -EINVAL;
 }
 
-- 
2.7.3


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

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

* Re: [PATCH 1/1] scripts: imx-image: Fix image size in flash header for i.MX35
  2016-04-13  7:36 [PATCH 1/1] scripts: imx-image: Fix image size in flash header for i.MX35 Alexander Stein
@ 2016-04-14  5:58 ` Sascha Hauer
  0 siblings, 0 replies; 2+ messages in thread
From: Sascha Hauer @ 2016-04-14  5:58 UTC (permalink / raw)
  To: Alexander Stein; +Cc: barebox, Daniel Krueger

On Wed, Apr 13, 2016 at 09:36:05AM +0200, Alexander Stein wrote:
> The i.MX35 needs additional 0x1000 byte. This quirk moved to the wrong
> location during refactoring of imx-image for v2016.03.0.
> 
> Fixes: adade597593442 ""scripts: imx: Allow to create signed images")
> Signed-off-by: Daniel Krueger <daniel.krueger@systec-electronic.com>
> Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
> ---
>  scripts/imx/imx.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)

Applied, thanks

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] 2+ messages in thread

end of thread, other threads:[~2016-04-14  5:59 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-04-13  7:36 [PATCH 1/1] scripts: imx-image: Fix image size in flash header for i.MX35 Alexander Stein
2016-04-14  5:58 ` Sascha Hauer

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