KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mtd - add partition offset parameter

Browse source 
The offset parameter can be used to write the data at the offset
instead of writing it to the beginning of the partition.

Signed-off-by: Marek Linder <lindner_marek@yahoo.de>

SVN-Revision: 32600
This commit is contained in:
Jo-Philipp Wich 2012-07-04 11:37:53 +00:00
parent bfef2d17eb
commit 0b83775202
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
package/mtd/src/mtd.c
View file

@ -286,7 +286,7 @@ indicate_writing(const char *mtd)
}
static int
mtd_write(int imagefd, const char *mtd, char *fis_layout)
mtd_write(int imagefd, const char *mtd, char *fis_layout, size_t part_offset)
{
char *next = NULL;
char *str = NULL;
@ -370,6 +370,11 @@ resume:
exit(1);
}
if (part_offset > 0) {
fprintf(stderr, "Seeking on mtd device '%s' to: %u\n", mtd, part_offset);
lseek(fd, part_offset, SEEK_SET);
}
indicate_writing(mtd);
w = e = 0;
@ -518,7 +523,8 @@ static void usage(void)
" -f force write without trx checks\n"
" -e <device> erase <device> before executing the command\n"
" -d <name> directory for jffs2write, defaults to \"tmp\"\n"
" -j <name> integrate <file> into jffs2 data when writing an image\n");
" -j <name> integrate <file> into jffs2 data when writing an image\n"
" -p write beginning at partition offset\n");
if (mtd_fixtrx) {
fprintf(stderr,
" -o offset offset of the image header in the partition(for fixtrx)\n");
@ -554,7 +560,7 @@ int main (int argc, char **argv)
int ch, i, boot, imagefd = 0, force, unlocked;
char *erase[MAX_ARGS], *device = NULL;
char *fis_layout = NULL;
size_t offset = 0;
size_t offset = 0, part_offset = 0;
enum {
CMD_ERASE,
CMD_WRITE,
@ -575,7 +581,7 @@ int main (int argc, char **argv)
#ifdef FIS_SUPPORT
"F:"
#endif
"frnqe:d:j:o:")) != -1)
"frnqe:d:j:p:o:")) != -1)
switch (ch) {
case 'f':
force = 1;
@ -603,6 +609,14 @@ int main (int argc, char **argv)
case 'd':
jffs2dir = optarg;
break;
case 'p':
errno = 0;
part_offset = strtoul(optarg, 0, 0);
if (errno) {
fprintf(stderr, "-p: illegal numeric string\n");
usage();
}
break;
case 'o':
if (!mtd_fixtrx) {
fprintf(stderr, "-o: is not available on this platform\n");
@ -704,7 +718,7 @@ int main (int argc, char **argv)
case CMD_WRITE:
if (!unlocked)
mtd_unlock(device);
mtd_write(imagefd, device, fis_layout);
mtd_write(imagefd, device, fis_layout, part_offset);
break;
case CMD_JFFS2WRITE:
if (!unlocked)