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

package/mtd: (enhancement) add option to prevent erase when writing to flash. (closes #8308)

Browse source 
SVN-Revision: 24132
This commit is contained in:
Alexandros C. Couloumbis 2010-11-24 14:10:01 +00:00
parent 695a1268e1
commit f5a54d6601
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -74,6 +74,7 @@ static char *imagefile = NULL;
static char *jffs2file = NULL, *jffs2dir = JFFS2_DEFAULT_DIR; static char *jffs2file = NULL, *jffs2dir = JFFS2_DEFAULT_DIR;
static int buflen = 0; static int buflen = 0;
int quiet; int quiet;
int no_erase;
int mtdsize = 0; int mtdsize = 0;
int erasesize = 0; int erasesize = 0;
@ -518,6 +519,8 @@ resume:
} }
/* need to erase the next block before writing data to it */ /* need to erase the next block before writing data to it */
if(no_erase)
{
while (w + buflen > e) { while (w + buflen > e) {
if (!quiet) if (!quiet)
fprintf(stderr, "\b\b\b[e]"); fprintf(stderr, "\b\b\b[e]");
@ -544,6 +547,7 @@ resume:
/* erase the chunk */ /* erase the chunk */
e += erasesize; e += erasesize;
} }
}
if (!quiet) if (!quiet)
fprintf(stderr, "\b\b\b[w]"); fprintf(stderr, "\b\b\b[w]");
@ -595,6 +599,7 @@ static void usage(void)
"Following options are available:\n" "Following options are available:\n"
" -q quiet mode (once: no [w] on writing,\n" " -q quiet mode (once: no [w] on writing,\n"
" twice: no status messages)\n" " twice: no status messages)\n"
" -n write without first erasing the blocks\n"
" -r reboot after successful command\n" " -r reboot after successful command\n"
" -f force write without trx checks\n" " -f force write without trx checks\n"
" -e <device> erase <device> before executing the command\n" " -e <device> erase <device> before executing the command\n"
@ -646,12 +651,13 @@ int main (int argc, char **argv)
force = 0; force = 0;
buflen = 0; buflen = 0;
quiet = 0; quiet = 0;
no_erase = 0;
while ((ch = getopt(argc, argv, while ((ch = getopt(argc, argv,
#ifdef FIS_SUPPORT #ifdef FIS_SUPPORT
"F:" "F:"
#endif #endif
"frqe:d:j:o:")) != -1) "frnqe:d:j:o:")) != -1)
switch (ch) { switch (ch) {
case 'f': case 'f':
force = 1; force = 1;
@ -659,6 +665,9 @@ int main (int argc, char **argv)
case 'r': case 'r':
boot = 1; boot = 1;
break; break;
case 'n':
no_erase = 1;
break;
case 'j': case 'j':
jffs2file = optarg; jffs2file = optarg;
break; break;