sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

commands/crc32: add compare 2 files crc 

add -F options to compare to file crc

it's usefull to compare what you flash in a partition

it's selectable by CONFIG_CMD_CRC_CMP

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD 2010-10-11 16:34:40 +02:00 committed by Sascha Hauer
parent 4dfd5b5c62
commit a828cef9b5
2 changed files with 80 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
commands/Kconfig
View File

@ -202,6 +202,11 @@ config CMD_CRC
select CRC32
prompt "crc"
config CMD_CRC_CMP
tristate
depends on CMD_CRC
prompt "compare 2 files crc"
config CMD_MTEST
tristate
prompt "mtest"

113
commands/crc.c
View File

@ -30,20 +30,80 @@
#include <malloc.h>
#include <linux/ctype.h>
static int file_crc(char* filename, ulong start, ulong size, ulong *crc,
ulong *total)
{
int fd, now;
int ret = 0;
char *buf;
*total = 0;
*crc = 0;
fd = open(filename, O_RDONLY);
if (fd < 0) {
printf("open %s: %s\n", filename, errno_str());
return fd;
}
if (start > 0) {
ret = lseek(fd, start, SEEK_SET);
if (ret == -1) {
perror("lseek");
goto out;
}
}
buf = xmalloc(4096);
while (size) {
now = min((ulong)4096, size);
now = read(fd, buf, now);
if (now < 0) {
ret = now;
perror("read");
goto out_free;
}
if (!now)
break;
*crc = crc32(*crc, buf, now);
size -= now;
*total += now;
}
printf ("CRC32 for %s 0x%08lx ... 0x%08lx ==> 0x%08lx",
filename, start, start + *total - 1, *crc);
out_free:
free(buf);
out:
close(fd);
return ret;
}
static int do_crc(struct command *cmdtp, int argc, char *argv[])
{
ulong start = 0, size = ~0, total = 0;
ulong crc = 0, vcrc = 0;
char *filename = "/dev/mem";
char *buf;
int fd, opt, err = 0, filegiven = 0, verify = 0, now;
#ifdef CONFIG_CMD_CRC_CMP
char *vfilename = NULL;
#endif
int opt, err = 0, filegiven = 0, verify = 0;
while((opt = getopt(argc, argv, "f:v:")) > 0) {
while((opt = getopt(argc, argv, "f:F:v:")) > 0) {
switch(opt) {
case 'f':
filename = optarg;
filegiven = 1;
break;
#ifdef CONFIG_CMD_CRC_CMP
case 'F':
verify = 1;
vfilename = optarg;
break;
#endif
case 'v':
verify = 1;
vcrc = simple_strtoul(optarg, NULL, 0);
@ -61,38 +121,17 @@ static int do_crc(struct command *cmdtp, int argc, char *argv[])
}
}
fd = open(filename, O_RDONLY);
if (fd < 0) {
printf("open %s: %s\n", filename, errno_str());
if (file_crc(filename, start, size, &crc, &total) < 0)
return 1;
#ifdef CONFIG_CMD_CRC_CMP
if (vfilename) {
size = total;
puts("\n");
if (file_crc(vfilename, start, size, &vcrc, &total) < 0)
return 1;
}
if (start > 0) {
if (lseek(fd, start, SEEK_SET) == -1) {
perror("lseek");
err = 1;
goto out;
}
}
buf = xmalloc(4096);
while (size) {
now = min((ulong)4096, size);
now = read(fd, buf, now);
if (now < 0) {
perror("read");
goto out_free;
}
if (!now)
break;
crc = crc32(crc, buf, now);
size -= now;
total += now;
}
printf ("CRC32 for %s 0x%08lx ... 0x%08lx ==> 0x%08lx",
filename, start, start + total - 1, crc);
#endif
if (verify && crc != vcrc) {
printf(" != 0x%08x ** ERROR **", vcrc);
@ -101,11 +140,6 @@ static int do_crc(struct command *cmdtp, int argc, char *argv[])
printf("\n");
out_free:
free(buf);
out:
close(fd);
return err;
}
@ -114,6 +148,9 @@ static const __maybe_unused char cmd_crc_help[] =
"Calculate a crc32 checksum of a memory area\n"
"Options:\n"
" -f <file> Use file instead of memory\n"
#ifdef CONFIG_CMD_CRC_CMP
" -F <file> Use file to compare\n"
#endif
" -v <crc> Verfify\n";
BAREBOX_CMD_START(crc32)