Merge branch 'master' of git://git.denx.de/u-boot-mips

[oweals/u-boot.git] / tools / imximage.c

diff --git a/tools/imximage.c b/tools/imximage.c
index 615a64e727f0b10e5152ab6685292f9922c0f164..2cd8d884873cc84877c1abe7f4ee88a2e7b5ada5 100644 (file)
--- a/tools/imximage.c
+++ b/tools/imximage.c
@@ -281,7 +281,6 @@ static void set_dcd_rst_v2(struct imx_header *imxhdr, uint32_t dcd_len,
                        d = (struct dcd_v2_cmd *)(((char *)d) + len);
 
                len = (char *)d - (char *)&dcd_v2->header;
-
                dcd_v2->header.tag = DCD_HEADER_TAG;
                dcd_v2->header.length = cpu_to_be16(len);
                dcd_v2->header.version = DCD_VERSION;
@@ -501,10 +500,19 @@ static void print_hdr_v2(struct imx_header *imx_hdr)
                printf("Entry Point:  %08x\n", (uint32_t)fhdr_v2->entry);
                if (fhdr_v2->csf && (imximage_ivt_offset != UNDEFINED) &&
                    (imximage_csf_size != UNDEFINED)) {
+                       uint16_t dcdlen;
+                       int offs;
+
+                       dcdlen = hdr_v2->data.dcd_table.header.length;
+                       offs = (char *)&hdr_v2->data.dcd_table
+                               - (char *)hdr_v2;
+
                        printf("HAB Blocks:   %08x %08x %08x\n",
                               (uint32_t)fhdr_v2->self, 0,
                               hdr_v2->boot_data.size - imximage_ivt_offset -
                               imximage_csf_size);
+                       printf("DCD Blocks:   00910000 %08x %08x\n",
+                              offs, be16_to_cpu(dcdlen));
                }
        } else {
                imx_header_v2_t *next_hdr_v2;
@@ -533,12 +541,19 @@ static void print_hdr_v2(struct imx_header *imx_hdr)
 
 static void copy_plugin_code(struct imx_header *imxhdr, char *plugin_file)
 {
-       int ifd = -1;
+       int ifd;
        struct stat sbuf;
        char *plugin_buf = imxhdr->header.hdr_v2.data.plugin_code;
        char *ptr;
 
        ifd = open(plugin_file, O_RDONLY|O_BINARY);
+       if (ifd < 0) {
+               fprintf(stderr, "Can't open %s: %s\n",
+                       plugin_file,
+                       strerror(errno));
+               exit(EXIT_FAILURE);
+       }
+
        if (fstat(ifd, &sbuf) < 0) {
                fprintf(stderr, "Can't stat %s: %s\n",
                        plugin_file,