tools: kwbimage: Print size of binary header in kwbimage_print_header()

The binary header in kwbimage contains executable SPL code.

Print information about this binary header and not only information
about it's data part.

Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Stefan Roese <sr@denx.de>
Reviewed-by: Chris Packham <judge.packham@gmail.com>
Tested-by: Chris Packham <judge.packham@gmail.com>

diff --git a/tools/kwbimage.c b/tools/kwbimage.c
index edda0ce7aac5e64b089c677b0563a02cda1bd019..bc302338716de96ed6bb7b74a6a5313b0eb83dde 100644 (file)
--- a/tools/kwbimage.c
+++ b/tools/kwbimage.c
@@ -1627,6 +1627,30 @@ static void kwbimage_print_header(const void *ptr)
        printf("Image Type:   MVEBU Boot from %s Image\n",
               image_boot_mode_name(mhdr->blockid));
        printf("Image version:%d\n", image_version((void *)ptr));
+       if (image_version((void *)ptr) == 1) {
+               struct main_hdr_v1 *mhdr = (struct main_hdr_v1 *)ptr;
+
+               if (mhdr->ext & 0x1) {
+                       struct opt_hdr_v1 *ohdr = (struct opt_hdr_v1 *)
+                                                 ((uint8_t *)ptr +
+                                                  sizeof(*mhdr));
+
+                       while (1) {
+                               uint32_t ohdr_size;
+
+                               ohdr_size = (ohdr->headersz_msb << 16) |
+                                           le16_to_cpu(ohdr->headersz_lsb);
+                               if (ohdr->headertype == OPT_HDR_V1_BINARY_TYPE) {
+                                       printf("BIN Hdr Size: ");
+                                       genimg_print_size(ohdr_size - 12 - 4 * ohdr->data[0]);
+                               }
+                               if (!(*((uint8_t *)ohdr + ohdr_size - 4) & 0x1))
+                                       break;
+                               ohdr = (struct opt_hdr_v1 *)((uint8_t *)ohdr +
+                                                            ohdr_size);
+                       }
+               }
+       }
        printf("Data Size:    ");
        genimg_print_size(mhdr->blocksize - sizeof(uint32_t));
        printf("Load Address: %08x\n", mhdr->destaddr);