tools/imximage: use 0x prefix in HAB Blocks line

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 <[email protected]>
Reviewed-by: Fabio Estevam <[email protected]>
Tested-by: Breno Lima <[email protected]>

diff --git a/doc/README.mxc_hab b/doc/README.mxc_hab
index 75390a505e60b6669fddf026908a80044ed59345..a40ebf3e84bce1926482abab3a5c039b767b19e4 100644 (file)
--- 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 ed9d93590316614bc8880ea94b51385b2f66b8ba..6dabb13520de53fde34fd172c2b7e964f99fd3e5 100644 (file)
--- 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);