V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

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>
This commit is contained in:
Nick Spence 2008-05-10 14:02:04 -07:00 committed by Wolfgang Denk
parent c9dca3c3f3
commit 02b9b22446
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common/image.c
View File

@ -23,7 +23,6 @@
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#ifndef USE_HOSTCC #ifndef USE_HOSTCC
#include <common.h> #include <common.h>
#include <watchdog.h> #include <watchdog.h>
@ -242,7 +241,7 @@ void image_multi_getimg (image_header_t *hdr, ulong idx,
{ {
int i; int i;
uint32_t *size; uint32_t *size;
ulong offset, tail, count, img_data; ulong offset, count, img_data;
/* get number of component */ /* get number of component */
count = image_multi_count (hdr); count = image_multi_count (hdr);
@ -258,19 +257,15 @@ void image_multi_getimg (image_header_t *hdr, ulong idx,
if (idx < count) { if (idx < count) {
*len = uimage_to_cpu (size[idx]); *len = uimage_to_cpu (size[idx]);
offset = 0; offset = 0;
tail = 0;
/* go over all indices preceding requested component idx */ /* go over all indices preceding requested component idx */
for (i = 0; i < idx; i++) { for (i = 0; i < idx; i++) {
/* add up i-th component size */ /* add up i-th component size, rounding up to 4 bytes */
offset += uimage_to_cpu (size[i]); offset += (uimage_to_cpu (size[i]) + 3) & ~3 ;
/* add up alignment for i-th component */
tail += (4 - uimage_to_cpu (size[i]) % 4);
} }
/* calculate idx-th component data address */ /* calculate idx-th component data address */
*data = img_data + offset + tail; *data = img_data + offset;
} else { } else {
*len = 0; *len = 0;
*data = 0; *data = 0;