summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2006-09-06 23:29:15 +0200
committerWolfgang Denk <wd@pollux.denx.de>2006-09-06 23:29:15 +0200
commit0dab03ba8fb20ede7233f497b6c6db188986e7a8 (patch)
tree9d7445a7817730b8160640f22529f469adbcc160
parentf60ba0d35e13e9dcf839d4563f9436d07468b1ef (diff)
downloadu-boot-imx-0dab03ba8fb20ede7233f497b6c6db188986e7a8.zip
u-boot-imx-0dab03ba8fb20ede7233f497b6c6db188986e7a8.tar.gz
u-boot-imx-0dab03ba8fb20ede7233f497b6c6db188986e7a8.tar.bz2
Fix mkimage -l bug with multifile images on 64bit platforms
Patch by David Updegraff, 06 Sep 2006
-rw-r--r--CHANGELOG3
-rw-r--r--tools/mkimage.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index a288465..3c42d93 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
Changes since U-Boot 1.1.4:
======================================================================
+* Fix mkimage -l bug with multifile images on 64bit platforms
+ Patch by David Updegraff, 06 Sep 2006
+
* Fix build problems on sorcery board.
* Fix coldfire build problems.
diff --git a/tools/mkimage.c b/tools/mkimage.c
index fea3e5b..60aac79 100644
--- a/tools/mkimage.c
+++ b/tools/mkimage.c
@@ -632,7 +632,7 @@ print_header (image_header_t *hdr)
if (hdr->ih_type == IH_TYPE_MULTI || hdr->ih_type == IH_TYPE_SCRIPT) {
int i, ptrs;
uint32_t pos;
- unsigned long *len_ptr = (unsigned long *) (
+ uint32_t *len_ptr = (uint32_t *) (
(unsigned long)hdr + sizeof(image_header_t)
);