diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-06-26 10:56:16 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-06-26 10:56:16 +0200 |
| commit | a11f778d76d96463fd8ae9e992afea98a1523a97 (patch) | |
| tree | 02b896a174d23b53089062ed468277f18c6b588d /board/trab/auto_update.c | |
| parent | f0e3d2b42268a9ed8d28c50c662eeba08379ceab (diff) | |
| parent | a63c31cff5147f1eca19d884ee120005775fbffc (diff) | |
| download | u-boot-imx-a11f778d76d96463fd8ae9e992afea98a1523a97.zip u-boot-imx-a11f778d76d96463fd8ae9e992afea98a1523a97.tar.gz u-boot-imx-a11f778d76d96463fd8ae9e992afea98a1523a97.tar.bz2 | |
Merge with /home/wd/git/u-boot/master
Diffstat (limited to 'board/trab/auto_update.c')
| -rw-r--r-- | board/trab/auto_update.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/board/trab/auto_update.c b/board/trab/auto_update.c index 056e562..442c555 100644 --- a/board/trab/auto_update.c +++ b/board/trab/auto_update.c @@ -222,7 +222,7 @@ au_check_cksum_valid(int idx, long nbytes) /* check the data CRC */ checksum = ntohl(hdr->ih_dcrc); - if (crc32 (0, (char *)(LOAD_ADDR + sizeof(*hdr)), ntohl(hdr->ih_size)) + if (crc32 (0, (uchar *)(LOAD_ADDR + sizeof(*hdr)), ntohl(hdr->ih_size)) != checksum) { printf ("Image %s bad data checksum\n", aufile[idx]); @@ -261,7 +261,7 @@ au_check_header_valid(int idx, long nbytes) checksum = ntohl(hdr->ih_hcrc); hdr->ih_hcrc = 0; - if (crc32 (0, (char *)hdr, sizeof(*hdr)) != checksum) { + if (crc32 (0, (uchar *)hdr, sizeof(*hdr)) != checksum) { printf ("Image %s bad header checksum\n", aufile[idx]); return -1; } @@ -397,7 +397,7 @@ au_do_update(int idx, long sz) } /* check the dcrc of the copy */ - if (crc32 (0, (char *)(start + off), ntohl(hdr->ih_size)) != ntohl(hdr->ih_dcrc)) { + if (crc32 (0, (uchar *)(start + off), ntohl(hdr->ih_size)) != ntohl(hdr->ih_dcrc)) { printf ("Image %s Bad Data Checksum After COPY\n", aufile[idx]); return -1; } @@ -613,7 +613,8 @@ do_auto_update(void) #define VFD_LOGO_WIDTH 112 #define VFD_LOGO_HEIGHT 72 /* must call transfer_pic directly */ - transfer_pic(3, env, VFD_LOGO_HEIGHT, VFD_LOGO_WIDTH); + transfer_pic(3, (unsigned char *)env, + VFD_LOGO_HEIGHT, VFD_LOGO_WIDTH); } bitmap_first = 1; } |