summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-09-17 18:01:04 -0400
committerTom Rini <trini@ti.com>2014-09-17 18:01:04 -0400
commite38b15b0619f9a8b869896229355808f494fb2ac (patch)
tree2048b9e715f1d6f76b298bf404d4b2e293ae3b0c /tools
parent1ee30aeed47724eb7c8f145f064b8d03cd294808 (diff)
parentc292adae170fa8c27dca75963bdb0a9afc640e57 (diff)
downloadu-boot-imx-e38b15b0619f9a8b869896229355808f494fb2ac.zip
u-boot-imx-e38b15b0619f9a8b869896229355808f494fb2ac.tar.gz
u-boot-imx-e38b15b0619f9a8b869896229355808f494fb2ac.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'tools')
-rw-r--r--tools/imximage.c7
-rw-r--r--tools/imximage.h2
2 files changed, 8 insertions, 1 deletions
diff --git a/tools/imximage.c b/tools/imximage.c
index 18dc051..faba238 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);
diff --git a/tools/imximage.h b/tools/imximage.h
index 01f861e..5b5ad0e 100644
--- a/tools/imximage.h
+++ b/tools/imximage.h
@@ -8,7 +8,7 @@
#ifndef _IMXIMAGE_H_
#define _IMXIMAGE_H_
-#define MAX_HW_CFG_SIZE_V2 121 /* Max number of registers imx can set for v2 */
+#define MAX_HW_CFG_SIZE_V2 220 /* Max number of registers imx can set for v2 */
#define MAX_HW_CFG_SIZE_V1 60 /* Max number of registers imx can set for v1 */
#define APP_CODE_BARKER 0xB1
#define DCD_BARKER 0xB17219E9