diff options
| author | Tom Rini <trini@konsulko.com> | 2018-04-30 07:14:05 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-04-30 07:14:05 -0400 |
| commit | b25f8e2112b1582ce6386e846800a31bab688e50 (patch) | |
| tree | 7fe8146a99851ce9256b8de3de2c86f1b276b92b /tools | |
| parent | abeb9d7897510533ce3a0a9515cac16db5bed834 (diff) | |
| parent | 07a8f79ee850b1e59371519f179d32fea171bbec (diff) | |
| download | u-boot-b25f8e2112b1582ce6386e846800a31bab688e50.tar.gz | |
Merge git://git.denx.de/u-boot-imx
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/imximage.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/imximage.c b/tools/imximage.c index 6dabb13520..14f80154d0 100644 --- a/tools/imximage.c +++ b/tools/imximage.c @@ -520,7 +520,7 @@ static void print_hdr_v2(struct imx_header *imx_hdr) (uint32_t)fhdr_v2->self, 0, hdr_v2->boot_data.size - imximage_ivt_offset - imximage_csf_size); - printf("DCD Blocks: 00910000 %08x %08x\n", + printf("DCD Blocks: 0x00910000 0x%08x 0x%08x\n", offs, be16_to_cpu(dcdlen)); } } else { @@ -777,6 +777,11 @@ static uint32_t parse_cfg_file(struct imx_header *imxhdr, char *name) (*set_dcd_rst)(imxhdr, dcd_len, name, lineno); fclose(fd); + /* Exit if there is no BOOT_FROM field specifying the flash_offset */ + if (imximage_ivt_offset == FLASH_OFFSET_UNDEFINED) { + fprintf(stderr, "Error: No BOOT_FROM tag in %s\n", name); + exit(EXIT_FAILURE); + } return dcd_len; } |