* mtd - simple memory technology device manipulation tool
*
* Copyright (C) 2005 Waldemar Brodkorb <wbx@dass-it.de>,
- * Copyright (C) 2005-2009 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2005-2009 Felix Fietkau <nbd@nbd.name>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License v2
if (!quiet)
fprintf(stderr, "\b\b\b ");
if (quiet < 2)
- fprintf(stderr, "\nAppending jffs2 data from %s to %s...", jffs2file, mtd);
+ fprintf(stderr, "\nAppending jffs2 data from %s to %s..\n.", jffs2file, mtd);
/* got an EOF marker - this is the place to add some jffs2 data */
skip = mtd_replace_jffs2(mtd, fd, e, jffs2file);
jffs2_replaced = 1;
break;
case MTD_IMAGE_FORMAT_SEAMA:
if (mtd_fixseama)
- mtd_fixseama(mtd, 0);
+ mtd_fixseama(mtd, 0, 0);
break;
default:
break;
fprintf(stderr,
" -o offset offset of the image header in the partition(for fixtrx)\n");
}
+ if (mtd_fixtrx || mtd_fixseama) {
+ fprintf(stderr,
+ " -c datasize amount of data to be used for checksum calculation (for fixtrx / fixseama)\n");
+ }
fprintf(stderr,
#ifdef FIS_SUPPORT
" -F <part>[:<size>[:<entrypoint>]][,<part>...]\n"
int ch, i, boot, imagefd = 0, force, unlocked;
char *erase[MAX_ARGS], *device = NULL;
char *fis_layout = NULL;
- size_t offset = 0, part_offset = 0, dump_len = 0;
+ size_t offset = 0, data_size = 0, part_offset = 0, dump_len = 0;
enum {
CMD_ERASE,
CMD_WRITE,
#ifdef FIS_SUPPORT
"F:"
#endif
- "frnqe:d:s:j:p:o:l:")) != -1)
+ "frnqe:d:s:j:p:o:c:l:")) != -1)
switch (ch) {
case 'f':
force = 1;
usage();
}
break;
+ case 'c':
+ errno = 0;
+ data_size = strtoul(optarg, 0, 0);
+ if (errno) {
+ fprintf(stderr, "-c: illegal numeric string\n");
+ usage();
+ }
+ break;
#ifdef FIS_SUPPORT
case 'F':
fis_layout = optarg;
mtd_write_jffs2(device, imagefile, jffs2dir);
break;
case CMD_FIXTRX:
- if (mtd_fixtrx) {
- mtd_fixtrx(device, offset);
- }
+ if (mtd_fixtrx) {
+ mtd_fixtrx(device, offset, data_size);
+ }
+ break;
case CMD_RESETBC:
- if (mtd_resetbc) {
- mtd_resetbc(device);
- }
+ if (mtd_resetbc) {
+ mtd_resetbc(device);
+ }
+ break;
case CMD_FIXSEAMA:
if (mtd_fixseama)
- mtd_fixseama(device, 0);
+ mtd_fixseama(device, 0, data_size);
break;
}