[PATCH v2] scripts: imx-image: fix first instruction in i.MX8MQ header

[PATCH v2] scripts: imx-image: fix first instruction in i.MX8MQ header

[Lucas Stach]

The instruction being patched in was a branch to 0x24000, instead of
the intended 0x9000. This doesn't matter when starting the image from
a regular boot source, but breaks starting the image via bootm, as we
rely on the jump in the first header instruction taking us to the
actual code.

As the code offset changes depending on the presence of the signed
HDMI firmware, compute the offet dynamically while building the image.

Fixes: 6d2132a9ded7 (scripts: imx-image: Add i.MX8MQ support)
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
v2: Implement correct fixup for when the HDMI firmware is present.
---
 scripts/imx/imx-image.c | 6 ++++++
 scripts/imx/imx.c       | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/scripts/imx/imx-image.c b/scripts/imx/imx-image.c
index 88e2cb955f11..fa93e4791784 100644
--- a/scripts/imx/imx-image.c
+++ b/scripts/imx/imx-image.c
@@ -894,6 +894,12 @@ int main(int argc, char *argv[])
 	if (cpu_is_aarch64(&data)) {
 		bb_header = bb_header_aarch64;
 		sizeof_bb_header = sizeof(bb_header_aarch64);
+		/*
+		 * Compute jump offset, must be done dynamically as the code
+		 * location changes depending on the presence of a signed HDMI
+		 * firmware.
+		 */
+		data.first_opcode |= (data.header_gap + header_len) >> 2;
 	} else {
 		bb_header = bb_header_aarch32;
 		sizeof_bb_header = sizeof(bb_header_aarch32);
diff --git a/scripts/imx/imx.c b/scripts/imx/imx.c
index 2341732b2fdd..43f67da288c1 100644
--- a/scripts/imx/imx.c
+++ b/scripts/imx/imx.c
@@ -243,7 +243,7 @@ static struct soc_type socs[] = {
 	{ .name = "imx53",  .header_version = 2, .cpu_type = IMX_CPU_IMX53,  .header_gap = 0,      .first_opcode = 0xea0003fe /* b 0x1000 */},
 	{ .name = "imx6",   .header_version = 2, .cpu_type = IMX_CPU_IMX6,   .header_gap = 0,      .first_opcode = 0xea0003fe /* b 0x1000 */},
 	{ .name = "imx7",   .header_version = 2, .cpu_type = IMX_CPU_IMX7,   .header_gap = 0,      .first_opcode = 0xea0003fe /* b 0x1000 */},
-	{ .name = "imx8mq", .header_version = 2, .cpu_type = IMX_CPU_IMX8MQ, .header_gap = SZ_32K, .first_opcode = 0x14009000 /* b 0x9000 */},
+	{ .name = "imx8mq", .header_version = 2, .cpu_type = IMX_CPU_IMX8MQ, .header_gap = SZ_32K, .first_opcode = 0x14000000 /* b 0x0000 (offset computed) */},
 	{ .name = "vf610",  .header_version = 2, .cpu_type = IMX_CPU_VF610,  .header_gap = 0,      .first_opcode = 0xea0003fe /* b 0x1000 */},
 };
 
-- 
2.19.1


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

Re: [PATCH v2] scripts: imx-image: fix first instruction in i.MX8MQ header

[Sascha Hauer]

On Wed, Nov 07, 2018 at 04:39:08PM +0100, Lucas Stach wrote:
> The instruction being patched in was a branch to 0x24000, instead of
> the intended 0x9000. This doesn't matter when starting the image from
> a regular boot source, but breaks starting the image via bootm, as we
> rely on the jump in the first header instruction taking us to the
> actual code.
> 
> As the code offset changes depending on the presence of the signed
> HDMI firmware, compute the offet dynamically while building the image.
> 
> Fixes: 6d2132a9ded7 (scripts: imx-image: Add i.MX8MQ support)
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
> v2: Implement correct fixup for when the HDMI firmware is present.
> ---
>  scripts/imx/imx-image.c | 6 ++++++
>  scripts/imx/imx.c       | 2 +-
>  2 files changed, 7 insertions(+), 1 deletion(-)

Applied, thanks

Sascha

> 
> diff --git a/scripts/imx/imx-image.c b/scripts/imx/imx-image.c
> index 88e2cb955f11..fa93e4791784 100644
> --- a/scripts/imx/imx-image.c
> +++ b/scripts/imx/imx-image.c
> @@ -894,6 +894,12 @@ int main(int argc, char *argv[])
>  	if (cpu_is_aarch64(&data)) {
>  		bb_header = bb_header_aarch64;
>  		sizeof_bb_header = sizeof(bb_header_aarch64);
> +		/*
> +		 * Compute jump offset, must be done dynamically as the code
> +		 * location changes depending on the presence of a signed HDMI
> +		 * firmware.
> +		 */
> +		data.first_opcode |= (data.header_gap + header_len) >> 2;
>  	} else {
>  		bb_header = bb_header_aarch32;
>  		sizeof_bb_header = sizeof(bb_header_aarch32);
> diff --git a/scripts/imx/imx.c b/scripts/imx/imx.c
> index 2341732b2fdd..43f67da288c1 100644
> --- a/scripts/imx/imx.c
> +++ b/scripts/imx/imx.c
> @@ -243,7 +243,7 @@ static struct soc_type socs[] = {
>  	{ .name = "imx53",  .header_version = 2, .cpu_type = IMX_CPU_IMX53,  .header_gap = 0,      .first_opcode = 0xea0003fe /* b 0x1000 */},
>  	{ .name = "imx6",   .header_version = 2, .cpu_type = IMX_CPU_IMX6,   .header_gap = 0,      .first_opcode = 0xea0003fe /* b 0x1000 */},
>  	{ .name = "imx7",   .header_version = 2, .cpu_type = IMX_CPU_IMX7,   .header_gap = 0,      .first_opcode = 0xea0003fe /* b 0x1000 */},
> -	{ .name = "imx8mq", .header_version = 2, .cpu_type = IMX_CPU_IMX8MQ, .header_gap = SZ_32K, .first_opcode = 0x14009000 /* b 0x9000 */},
> +	{ .name = "imx8mq", .header_version = 2, .cpu_type = IMX_CPU_IMX8MQ, .header_gap = SZ_32K, .first_opcode = 0x14000000 /* b 0x0000 (offset computed) */},
>  	{ .name = "vf610",  .header_version = 2, .cpu_type = IMX_CPU_VF610,  .header_gap = 0,      .first_opcode = 0xea0003fe /* b 0x1000 */},
>  };
>  
> -- 
> 2.19.1
> 
> 
> _______________________________________________
> 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