diff options
| author | Tom Rini <trini@konsulko.com> | 2015-09-02 10:39:28 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-09-02 10:39:28 -0400 |
| commit | 0ffadab1b9ab59816a0f71c927604bb6c402d863 (patch) | |
| tree | 8338cea40ce53158387da4f708b09487cdebeaf9 /tools/imximage.c | |
| parent | 6923b069bd50b3ac519b16b6ae6aabbd2984c391 (diff) | |
| parent | 37cf215253a488ba6b903989b1eff072f59d266e (diff) | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'tools/imximage.c')
| -rw-r--r-- | tools/imximage.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/imximage.c b/tools/imximage.c index 909efaba2d1..0da48a733d4 100644 --- a/tools/imximage.c +++ b/tools/imximage.c @@ -288,7 +288,11 @@ static void set_imx_hdr_v2(struct imx_header *imxhdr, uint32_t dcd_len, hdr_base = entry_point - imximage_init_loadsize + flash_offset; fhdr_v2->self = hdr_base; - fhdr_v2->dcd_ptr = hdr_base + offsetof(imx_header_v2_t, dcd_table); + if (dcd_len > 0) + fhdr_v2->dcd_ptr = hdr_base + + offsetof(imx_header_v2_t, dcd_table); + else + fhdr_v2->dcd_ptr = 0; fhdr_v2->boot_data_ptr = hdr_base + offsetof(imx_header_v2_t, boot_data); hdr_v2->boot_data.start = entry_point - imximage_init_loadsize; |