diff options
| author | Nick Spence <nick.spence@freescale.com> | 2008-05-10 14:02:04 -0700 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-05-12 00:44:24 +0200 |
| commit | 02b9b22446e3d7ad6a6382be17a1ce79a7de589b (patch) | |
| tree | 1c5e0a843856256fd6f66b13d637ef5e47d5ea57 /common | |
| parent | c9dca3c3f37d2647aec4509b24b16d15882ae3e4 (diff) | |
| download | bootable_bootloader_goldelico_gta04-02b9b22446e3d7ad6a6382be17a1ce79a7de589b.zip bootable_bootloader_goldelico_gta04-02b9b22446e3d7ad6a6382be17a1ce79a7de589b.tar.gz bootable_bootloader_goldelico_gta04-02b9b22446e3d7ad6a6382be17a1ce79a7de589b.tar.bz2 | |
Fix offset calculation for multi-type legacy images.
Calculation of tail was incorrect when size % 4 == 0.
New code removes the conditional and does the same thing but with arithmetic
Signed-off-by: Nick Spence <nick.spence@freescale.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/image.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/common/image.c b/common/image.c index f7faf50..9e9e023 100644 --- a/common/image.c +++ b/common/image.c @@ -23,7 +23,6 @@ * MA 02111-1307 USA */ - #ifndef USE_HOSTCC #include <common.h> #include <watchdog.h> @@ -242,7 +241,7 @@ void image_multi_getimg (image_header_t *hdr, ulong idx, { int i; uint32_t *size; - ulong offset, tail, count, img_data; + ulong offset, count, img_data; /* get number of component */ count = image_multi_count (hdr); @@ -258,19 +257,15 @@ void image_multi_getimg (image_header_t *hdr, ulong idx, if (idx < count) { *len = uimage_to_cpu (size[idx]); offset = 0; - tail = 0; /* go over all indices preceding requested component idx */ for (i = 0; i < idx; i++) { - /* add up i-th component size */ - offset += uimage_to_cpu (size[i]); - - /* add up alignment for i-th component */ - tail += (4 - uimage_to_cpu (size[i]) % 4); + /* add up i-th component size, rounding up to 4 bytes */ + offset += (uimage_to_cpu (size[i]) + 3) & ~3 ; } /* calculate idx-th component data address */ - *data = img_data + offset + tail; + *data = img_data + offset; } else { *len = 0; *data = 0; |