diff mbox series

tools/imx8mimage: Remove the usage of IVT reserved1 field

Message ID 20220702235803.24996-1-peng.fan@oss.nxp.com
State Accepted
Commit 4f1851d0591c55fe26802054e4f28f8200bbefe7
Headers show
Series tools/imx8mimage: Remove the usage of IVT reserved1 field | expand

Commit Message

Peng Fan (OSS) July 2, 2022, 11:58 p.m. UTC 
From: Peng Fan <peng.fan@nxp.com>

Commit log from NXP imx-mkimage:
On iMX8MQ B2, ROM will check IVT header and requires the reserved fields
in IVT to be 0.
However, in imx-mkimage we set the reserved1 field for the offset from
second boot image to SPL boot image, which was used for mfgtool but
has deprecated. So remove it to fix the boot failure on iMX8MQ B2.

Update imx8mimage to address same issue

Cc: Mihai Chelalau <mihai.chelalau@nxp.com>
Cc: Dan Douglass <dan.douglass@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
 tools/imx8mimage.c | 8 --------
 1 file changed, 8 deletions(-)

Comments

Michael Nazzareno Trimarchi July 3, 2022, 6:43 a.m. UTC | #1 
Hi Peng

On Sun, Jul 3, 2022 at 1:15 AM Peng Fan (OSS) <peng.fan@oss.nxp.com> wrote:
>
> From: Peng Fan <peng.fan@nxp.com>
>
> Commit log from NXP imx-mkimage:
> On iMX8MQ B2, ROM will check IVT header and requires the reserved fields
> in IVT to be 0.
> However, in imx-mkimage we set the reserved1 field for the offset from
> second boot image to SPL boot image, which was used for mfgtool but
> has deprecated. So remove it to fix the boot failure on iMX8MQ B2.
>
> Update imx8mimage to address same issue
>
> Cc: Mihai Chelalau <mihai.chelalau@nxp.com>
> Cc: Dan Douglass <dan.douglass@nxp.com>
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> ---
>  tools/imx8mimage.c | 8 --------
>  1 file changed, 8 deletions(-)
>
> diff --git a/tools/imx8mimage.c b/tools/imx8mimage.c
> index 4eed683396f..52baf4c9903 100644
> --- a/tools/imx8mimage.c
> +++ b/tools/imx8mimage.c
> @@ -505,14 +505,6 @@ void build_image(int ofd)
>                         exit(EXIT_FAILURE);
>                 } else {
>                         sld_header_off = sld_src_off - rom_image_offset;
> -                       /*
> -                        * Record the second bootloader relative offset in
> -                        * image's IVT reserved1
> -                        */
> -                       if (rom_version == ROM_V1) {
> -                               imx_header[IMAGE_IVT_ID].fhdr.reserved1 =
> -                                       sld_header_off - header_image_off;
> -                       }
>                         sld_fd = open(sld_img, O_RDONLY | O_BINARY);
>                         if (sld_fd < 0) {
>                                 fprintf(stderr, "%s: Can't open: %s\n",
> --
> 2.36.0
>

I have seen a similar change from Marek last week

tools: imx8mimage: Keep IVT reserved1 field zero always

Michael
Peng Fan (OSS) July 3, 2022, 6:46 a.m. UTC | #2 
> Subject: Re: [PATCH] tools/imx8mimage: Remove the usage of IVT reserved1
> field
> 
> Hi Peng
> 
> On Sun, Jul 3, 2022 at 1:15 AM Peng Fan (OSS) <peng.fan@oss.nxp.com>
> wrote:
> >
> > From: Peng Fan <peng.fan@nxp.com>
> >
> > Commit log from NXP imx-mkimage:
> > On iMX8MQ B2, ROM will check IVT header and requires the reserved
> > fields in IVT to be 0.
> > However, in imx-mkimage we set the reserved1 field for the offset from
> > second boot image to SPL boot image, which was used for mfgtool but
> > has deprecated. So remove it to fix the boot failure on iMX8MQ B2.
> >
> > Update imx8mimage to address same issue
> >
> > Cc: Mihai Chelalau <mihai.chelalau@nxp.com>
> > Cc: Dan Douglass <dan.douglass@nxp.com>
> > Signed-off-by: Peng Fan <peng.fan@nxp.com>
> > ---
> >  tools/imx8mimage.c | 8 --------
> >  1 file changed, 8 deletions(-)
> >
> > diff --git a/tools/imx8mimage.c b/tools/imx8mimage.c index
> > 4eed683396f..52baf4c9903 100644
> > --- a/tools/imx8mimage.c
> > +++ b/tools/imx8mimage.c
> > @@ -505,14 +505,6 @@ void build_image(int ofd)
> >                         exit(EXIT_FAILURE);
> >                 } else {
> >                         sld_header_off = sld_src_off - rom_image_offset;
> > -                       /*
> > -                        * Record the second bootloader relative offset in
> > -                        * image's IVT reserved1
> > -                        */
> > -                       if (rom_version == ROM_V1) {
> > -                               imx_header[IMAGE_IVT_ID].fhdr.reserved1 =
> > -                                       sld_header_off - header_image_off;
> > -                       }
> >                         sld_fd = open(sld_img, O_RDONLY | O_BINARY);
> >                         if (sld_fd < 0) {
> >                                 fprintf(stderr, "%s: Can't open:
> > %s\n",
> > --
> > 2.36.0
> >
> 
> I have seen a similar change from Marek last week
> 
> tools: imx8mimage: Keep IVT reserved1 field zero always
[Peng Fan] 

Oh, yes. Please ignore this patch.

Thanks,
Peng.

> 
> Michael
Michael Nazzareno Trimarchi July 3, 2022, 6:48 a.m. UTC | #3 
Hi Peng

On Sun, Jul 3, 2022 at 8:46 AM Peng Fan (OSS) <peng.fan@oss.nxp.com> wrote:
>
> > Subject: Re: [PATCH] tools/imx8mimage: Remove the usage of IVT reserved1
> > field
> >
> > Hi Peng
> >
> > On Sun, Jul 3, 2022 at 1:15 AM Peng Fan (OSS) <peng.fan@oss.nxp.com>
> > wrote:
> > >
> > > From: Peng Fan <peng.fan@nxp.com>
> > >
> > > Commit log from NXP imx-mkimage:
> > > On iMX8MQ B2, ROM will check IVT header and requires the reserved
> > > fields in IVT to be 0.
> > > However, in imx-mkimage we set the reserved1 field for the offset from
> > > second boot image to SPL boot image, which was used for mfgtool but
> > > has deprecated. So remove it to fix the boot failure on iMX8MQ B2.
> > >
> > > Update imx8mimage to address same issue
> > >
> > > Cc: Mihai Chelalau <mihai.chelalau@nxp.com>
> > > Cc: Dan Douglass <dan.douglass@nxp.com>
> > > Signed-off-by: Peng Fan <peng.fan@nxp.com>
> > > ---
> > >  tools/imx8mimage.c | 8 --------
> > >  1 file changed, 8 deletions(-)
> > >
> > > diff --git a/tools/imx8mimage.c b/tools/imx8mimage.c index
> > > 4eed683396f..52baf4c9903 100644
> > > --- a/tools/imx8mimage.c
> > > +++ b/tools/imx8mimage.c
> > > @@ -505,14 +505,6 @@ void build_image(int ofd)
> > >                         exit(EXIT_FAILURE);
> > >                 } else {
> > >                         sld_header_off = sld_src_off - rom_image_offset;
> > > -                       /*
> > > -                        * Record the second bootloader relative offset in
> > > -                        * image's IVT reserved1
> > > -                        */
> > > -                       if (rom_version == ROM_V1) {
> > > -                               imx_header[IMAGE_IVT_ID].fhdr.reserved1 =
> > > -                                       sld_header_off - header_image_off;
> > > -                       }
> > >                         sld_fd = open(sld_img, O_RDONLY | O_BINARY);
> > >                         if (sld_fd < 0) {
> > >                                 fprintf(stderr, "%s: Can't open:
> > > %s\n",
> > > --
> > > 2.36.0
> > >
> >
> > I have seen a similar change from Marek last week
> >
> > tools: imx8mimage: Keep IVT reserved1 field zero always
> [Peng Fan]
>
> Oh, yes. Please ignore this patch.
>

Can you add your review on the Marek patch?

Michael

> Thanks,
> Peng.
>
> >
> > Michael
diff mbox series

Patch

diff --git a/tools/imx8mimage.c b/tools/imx8mimage.c
index 4eed683396f..52baf4c9903 100644
--- a/tools/imx8mimage.c
+++ b/tools/imx8mimage.c
@@ -505,14 +505,6 @@  void build_image(int ofd)
 			exit(EXIT_FAILURE);
 		} else {
 			sld_header_off = sld_src_off - rom_image_offset;
-			/*
-			 * Record the second bootloader relative offset in
-			 * image's IVT reserved1
-			 */
-			if (rom_version == ROM_V1) {
-				imx_header[IMAGE_IVT_ID].fhdr.reserved1 =
-					sld_header_off - header_image_off;
-			}
 			sld_fd = open(sld_img, O_RDONLY | O_BINARY);
 			if (sld_fd < 0) {
 				fprintf(stderr, "%s: Can't open: %s\n",