diff options
author | Minkyu Kang <mk7.kang@samsung.com> | 2014-10-07 19:14:03 +0900 |
---|---|---|
committer | Minkyu Kang <mk7.kang@samsung.com> | 2014-10-07 19:14:03 +0900 |
commit | 3cc83f9d08a80fddf4c1e8e766eff8273f30814c (patch) | |
tree | 831246a1b77d26d0296a84c90684e0fee0368737 /tools/imximage.c | |
parent | 64f41212d880f3d00c6994d973aadeec5bda1b65 (diff) | |
parent | 6dd0e7c00bfa5ce861a72b8e4a3ef9e787306125 (diff) | |
download | talos-obmc-uboot-3cc83f9d08a80fddf4c1e8e766eff8273f30814c.tar.gz talos-obmc-uboot-3cc83f9d08a80fddf4c1e8e766eff8273f30814c.zip |
Merge branch 'uboot'
Diffstat (limited to 'tools/imximage.c')
-rw-r--r-- | tools/imximage.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tools/imximage.c b/tools/imximage.c index 18dc051c5e..faba23860f 100644 --- a/tools/imximage.c +++ b/tools/imximage.c @@ -568,6 +568,13 @@ static void imximage_set_header(void *ptr, struct stat *sbuf, int ifd, /* Parse dcd configuration file */ dcd_len = parse_cfg_file(imxhdr, params->imagename); + if (imximage_version == IMXIMAGE_V2) { + if (imximage_init_loadsize < imximage_ivt_offset + + sizeof(imx_header_v2_t)) + imximage_init_loadsize = imximage_ivt_offset + + sizeof(imx_header_v2_t); + } + /* Set the imx header */ (*set_imx_hdr)(imxhdr, dcd_len, params->ep, imximage_ivt_offset); |