phone-side
/
uboot-mt623x
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tools: mkimage: Fixed build warnings 

uninitialized retval variable warning fixed
crc32 APIs moved to crc.h (newly added) and build warnings fixed

Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
Prafulla Wadaskar 2009-08-16 05:28:19 +05:30 committed by Wolfgang Denk
parent 14821d7dea
commit 449609f5b1
3 changed files with 43 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/common.h
View File

@ -624,9 +624,7 @@ int vsprintf(char *buf, const char *fmt, va_list args);
char * strmhz(char *buf, long hz);
/* lib_generic/crc32.c */
uint32_t crc32 (uint32_t, const unsigned char *, uint);
uint32_t crc32_wd (uint32_t, const unsigned char *, uint, uint);
uint32_t crc32_no_comp (uint32_t, const unsigned char *, uint);
#include <u-boot/crc.h>
/* common/console.c */
int console_init_f(void); /* Before relocation; uses the serial stuff */

33
include/u-boot/crc.h Normal file
View File

@ -0,0 +1,33 @@
/*
* (C) Copyright 2009
* Marvell Semiconductor <www.marvell.com>
* Written-by: Prafulla Wadaskar <prafulla@marvell.com>
*
* See file CREDITS for list of people who contributed to this
* project.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301 USA
*/
#ifndef _UBOOT_CRC_H
#define _UBOOT_CRC_H
/* lib_generic/crc32.c */
uint32_t crc32 (uint32_t, const unsigned char *, uint);
uint32_t crc32_wd (uint32_t, const unsigned char *, uint, uint);
uint32_t crc32_no_comp (uint32_t, const unsigned char *, uint);
#endif /* _UBOOT_CRC_H */

16
tools/mkimage.c
View File

@ -23,8 +23,8 @@
#include "mkimage.h"
#include <image.h>
#include <u-boot/crc.h>
extern unsigned long crc32 (unsigned long crc, const char *buf, unsigned int len);
static void copy_file (int, const char *, int);
static void usage (void);
static int image_verify_header (char *, int);
@ -59,7 +59,7 @@ main (int argc, char **argv)
struct stat sbuf;
unsigned char *ptr;
char *name = "";
int retval;
int retval = 0;
cmdname = *argv;
@ -333,7 +333,8 @@ NXTARG: ;
hdr = (image_header_t *)ptr;
checksum = crc32 (0,
(const char *)(ptr + image_get_header_size ()),
(const unsigned char *)(ptr +
image_get_header_size ()),
sbuf.st_size - image_get_header_size ()
);
@ -351,7 +352,8 @@ NXTARG: ;
image_set_name (hdr, name);
checksum = crc32 (0, (const char *)hdr, image_get_header_size ());
checksum = crc32 (0, (const unsigned char *)hdr,
image_get_header_size ());
image_set_hcrc (hdr, checksum);
@ -484,7 +486,7 @@ static int
image_verify_header (char *ptr, int image_size)
{
int len;
char *data;
const unsigned char *data;
uint32_t checksum;
image_header_t header;
image_header_t *hdr = &header;
@ -503,7 +505,7 @@ image_verify_header (char *ptr, int image_size)
return -FDT_ERR_BADMAGIC;
}
data = (char *)hdr;
data = (const unsigned char *)hdr;
len = sizeof(image_header_t);
checksum = be32_to_cpu(hdr->ih_hcrc);
@ -516,7 +518,7 @@ image_verify_header (char *ptr, int image_size)
return -FDT_ERR_BADSTATE;
}
data = ptr + sizeof(image_header_t);
data = (const unsigned char *)ptr + sizeof(image_header_t);
len = image_size - sizeof(image_header_t) ;
if (crc32 (0, data, len) != be32_to_cpu(hdr->ih_dcrc)) {