aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2012-07-04 11:37:53 +0000
committerJo-Philipp Wich <jow@openwrt.org>2012-07-04 11:37:53 +0000
commita39f21d5b0b8cb265e8f2c855d149a5d3932aec3 (patch)
treeae666892dd32bcd2a56de0957ea0f02d8c30415d
parente476f06414f3438a9c37db73e827209d26f9c81a (diff)
downloadupstream-a39f21d5b0b8cb265e8f2c855d149a5d3932aec3.tar.gz
upstream-a39f21d5b0b8cb265e8f2c855d149a5d3932aec3.tar.bz2
upstream-a39f21d5b0b8cb265e8f2c855d149a5d3932aec3.zip
mtd - add partition offset parameter
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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32600 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/mtd/src/mtd.c26
1 files changed, 20 insertions, 6 deletions
diff --git a/package/mtd/src/mtd.c b/package/mtd/src/mtd.c
index a7d4c1b857..92873ca19b 100644
--- a/package/mtd/src/mtd.c
+++ b/package/mtd/src/mtd.c
@@ -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;
@@ -509,7 +514,7 @@ static void usage(void)
fprintf(stderr,
" fixtrx fix the checksum in a trx header on first boot\n");
}
- fprintf(stderr,
+ fprintf(stderr,
"Following options are available:\n"
" -q quiet mode (once: no [w] on writing,\n"
" twice: no status messages)\n"
@@ -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)