diff options
| author | Tom Rini <trini@konsulko.com> | 2018-07-23 10:51:13 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-07-23 13:37:42 -0400 |
| commit | f0306a145b3234ae4bd3b46f2567b6f1ad7b8f4f (patch) | |
| tree | bc633e8be8d1a34cd472e42d59e415e71fe1477a /tools/imximage.c | |
| parent | 9c5b00973bceb7c0192bd6b03672d69b092700b4 (diff) | |
| parent | f97f167107b33fc6596561dae1309571ade39055 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-imx
trini: Update colibri-imx6ull to use Kconfig for mtdparts related
options.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'tools/imximage.c')
| -rw-r--r-- | tools/imximage.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/tools/imximage.c b/tools/imximage.c index 5f63bf87594..d7c0b6e883f 100644 --- a/tools/imximage.c +++ b/tools/imximage.c @@ -506,8 +506,7 @@ static void print_hdr_v2(struct imx_header *imx_hdr) genimg_print_size(hdr_v2->boot_data.size); printf("Load Address: %08x\n", (uint32_t)fhdr_v2->boot_data_ptr); printf("Entry Point: %08x\n", (uint32_t)fhdr_v2->entry); - if (fhdr_v2->csf && (imximage_ivt_offset != UNDEFINED) && - (imximage_csf_size != UNDEFINED)) { + if (fhdr_v2->csf) { uint16_t dcdlen; int offs; @@ -515,10 +514,16 @@ static void print_hdr_v2(struct imx_header *imx_hdr) offs = (char *)&hdr_v2->data.dcd_table - (char *)hdr_v2; + /* + * The HAB block is the first part of the image, from + * start of IVT header (fhdr_v2->self) to the start of + * the CSF block (fhdr_v2->csf). So HAB size is + * calculated as: + * HAB_size = fhdr_v2->csf - fhdr_v2->self + */ 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); + (uint32_t)(fhdr_v2->csf - fhdr_v2->self)); printf("DCD Blocks: 0x00910000 0x%08x 0x%08x\n", offs, be16_to_cpu(dcdlen)); } |