Message ID | 20180323110803.16512-2-rasmus.villemoes@prevas.dk |
---|---|
State | Accepted |
Commit | 8519c9c98ad60e9eb6f655bfa8214f53407d86fb |
Delegated to: | Stefano Babic |
Headers | show |
Series | [U-Boot,1/2] Makefile: always preserve output for images that can contain HAB Blocks | expand |
On Fri, Mar 23, 2018 at 8:08 AM, Rasmus Villemoes <rasmus.villemoes@prevas.dk> wrote: > The u-boot-ivt.img.log file contains 0x prefixes in the HAB Blocks line, > while the SPL.log does not. For consistency, and to make it easier to > extract and put into a .csf file for use with NXP's code signing tool, > add 0x prefixes here. > > Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
Hi Rasmus, 2018-03-23 9:40 GMT-03:00 Fabio Estevam <festevam@gmail.com>: > On Fri, Mar 23, 2018 at 8:08 AM, Rasmus Villemoes > <rasmus.villemoes@prevas.dk> wrote: >> The u-boot-ivt.img.log file contains 0x prefixes in the HAB Blocks line, >> while the SPL.log does not. For consistency, and to make it easier to >> extract and put into a .csf file for use with NXP's code signing tool, >> add 0x prefixes here. >> >> Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> > > Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com> Tested-by: Breno Lima <breno.lima@nxp.com> Thanks, Breno Lima
On 23/03/2018 12:08, Rasmus Villemoes wrote: > The u-boot-ivt.img.log file contains 0x prefixes in the HAB Blocks line, > while the SPL.log does not. For consistency, and to make it easier to > extract and put into a .csf file for use with NXP's code signing tool, > add 0x prefixes here. > > Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> > --- > doc/README.mxc_hab | 14 +++++++------- > tools/imximage.c | 2 +- > 2 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/doc/README.mxc_hab b/doc/README.mxc_hab > index 75390a505e..a40ebf3e84 100644 > --- a/doc/README.mxc_hab > +++ b/doc/README.mxc_hab > @@ -33,12 +33,12 @@ Image Ver: 2 (i.MX53/6 compatible) > Data Size: 327680 Bytes = 320.00 kB = 0.31 MB > Load Address: 177ff420 > Entry Point: 17800000 > -HAB Blocks: 177ff400 00000000 0004dc00 > - ^^^^^^^^ ^^^^^^^^ ^^^^^^^^ > - | | | > - | | -------- (1) > - | | > - | ------------------- (2) > +HAB Blocks: 0x177ff400 0x00000000 0x0004dc00 > + ^^^^^^^^^^ ^^^^^^^^^^ ^^^^^^^^^^ > + | | | > + | | ----- (1) > + | | > + | ---------------- (2) > | > --------------------------- (3) > > @@ -78,7 +78,7 @@ Example Output of the SPL (imximage) creation: > Data Size: 61440 Bytes = 60.00 kB = 0.06 MB > Load Address: 00907420 > Entry Point: 00908000 > - HAB Blocks: 00907400 00000000 0000cc00 > + HAB Blocks: 0x00907400 0x00000000 0x0000cc00 > > Example Output of the u-boot-ivt.img (firmware_ivt) creation: > Image Name: U-Boot 2016.11-rc1-31589-g2a4411 > diff --git a/tools/imximage.c b/tools/imximage.c > index ed9d935903..6dabb13520 100644 > --- a/tools/imximage.c > +++ b/tools/imximage.c > @@ -516,7 +516,7 @@ static void print_hdr_v2(struct imx_header *imx_hdr) > offs = (char *)&hdr_v2->data.dcd_table > - (char *)hdr_v2; > > - printf("HAB Blocks: %08x %08x %08x\n", > + printf("HAB Blocks: 0x%08x 0x%08x 0x%08x\n", > (uint32_t)fhdr_v2->self, 0, > hdr_v2->boot_data.size - imximage_ivt_offset - > imximage_csf_size); > Applied to u-boot-imx, thanks ! Best regards, Stefano Babic
diff --git a/doc/README.mxc_hab b/doc/README.mxc_hab index 75390a505e..a40ebf3e84 100644 --- a/doc/README.mxc_hab +++ b/doc/README.mxc_hab @@ -33,12 +33,12 @@ Image Ver: 2 (i.MX53/6 compatible) Data Size: 327680 Bytes = 320.00 kB = 0.31 MB Load Address: 177ff420 Entry Point: 17800000 -HAB Blocks: 177ff400 00000000 0004dc00 - ^^^^^^^^ ^^^^^^^^ ^^^^^^^^ - | | | - | | -------- (1) - | | - | ------------------- (2) +HAB Blocks: 0x177ff400 0x00000000 0x0004dc00 + ^^^^^^^^^^ ^^^^^^^^^^ ^^^^^^^^^^ + | | | + | | ----- (1) + | | + | ---------------- (2) | --------------------------- (3) @@ -78,7 +78,7 @@ Example Output of the SPL (imximage) creation: Data Size: 61440 Bytes = 60.00 kB = 0.06 MB Load Address: 00907420 Entry Point: 00908000 - HAB Blocks: 00907400 00000000 0000cc00 + HAB Blocks: 0x00907400 0x00000000 0x0000cc00 Example Output of the u-boot-ivt.img (firmware_ivt) creation: Image Name: U-Boot 2016.11-rc1-31589-g2a4411 diff --git a/tools/imximage.c b/tools/imximage.c index ed9d935903..6dabb13520 100644 --- a/tools/imximage.c +++ b/tools/imximage.c @@ -516,7 +516,7 @@ static void print_hdr_v2(struct imx_header *imx_hdr) offs = (char *)&hdr_v2->data.dcd_table - (char *)hdr_v2; - printf("HAB Blocks: %08x %08x %08x\n", + printf("HAB Blocks: 0x%08x 0x%08x 0x%08x\n", (uint32_t)fhdr_v2->self, 0, hdr_v2->boot_data.size - imximage_ivt_offset - imximage_csf_size);
The u-boot-ivt.img.log file contains 0x prefixes in the HAB Blocks line, while the SPL.log does not. For consistency, and to make it easier to extract and put into a .csf file for use with NXP's code signing tool, add 0x prefixes here. Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> --- doc/README.mxc_hab | 14 +++++++------- tools/imximage.c | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-)