summaryrefslogtreecommitdiff
path: root/nandwrite.c
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@gmail.com>2006-05-27 10:10:03 -0500
committerJosh Boyer <jwboyer@gmail.com>2006-05-27 10:10:03 -0500
commit69358f79c0523f40001aebb6e43b2401b3a3e070 (patch)
tree4c5b382d02870a6a30a67a75d49ebd916e52ec6d /nandwrite.c
parenta96ff574c24dab891c4061d2103815e34aeb78f8 (diff)
parentc712b2344e47101df11f46997508bf96b9f4e24e (diff)
Merge git://git.infradead.org/users/joern/utils
Diffstat (limited to 'nandwrite.c')
-rw-r--r--nandwrite.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/nandwrite.c b/nandwrite.c
index fe19b82..10489b7 100644
--- a/nandwrite.c
+++ b/nandwrite.c
@@ -240,9 +240,9 @@ int main(int argc, char **argv)
meminfo.erasesize *= blockalign;
/* Make sure device page sizes are valid */
- if (!(meminfo.oobsize == 16 && meminfo.oobblock == 512) &&
- !(meminfo.oobsize == 8 && meminfo.oobblock == 256) &&
- !(meminfo.oobsize == 64 && meminfo.oobblock == 2048)) {
+ if (!(meminfo.oobsize == 16 && meminfo.writesize == 512) &&
+ !(meminfo.oobsize == 8 && meminfo.writesize == 256) &&
+ !(meminfo.oobsize == 64 && meminfo.writesize == 2048)) {
fprintf(stderr, "Unknown flash (not normal NAND)\n");
close(fd);
exit(1);
@@ -319,7 +319,7 @@ int main(int argc, char **argv)
imglen = lseek(ifd, 0, SEEK_END);
lseek (ifd, 0, SEEK_SET);
- pagelen = meminfo.oobblock + ((writeoob == 1) ? meminfo.oobsize : 0);
+ pagelen = meminfo.writesize + ((writeoob == 1) ? meminfo.oobsize : 0);
// Check, if file is pagealigned
if ((!pad) && ((imglen % pagelen) != 0)) {
@@ -328,9 +328,9 @@ int main(int argc, char **argv)
}
// Check, if length fits into device
- if ( ((imglen / pagelen) * meminfo.oobblock) > (meminfo.size - mtdoffset)) {
+ if ( ((imglen / pagelen) * meminfo.writesize) > (meminfo.size - mtdoffset)) {
fprintf (stderr, "Image %d bytes, NAND page %d bytes, OOB area %u bytes, device size %u bytes\n",
- imglen, pagelen, meminfo.oobblock, meminfo.size);
+ imglen, pagelen, meminfo.writesize, meminfo.size);
perror ("Input file does not fit into device");
goto closeall;
}
@@ -370,11 +370,11 @@ int main(int argc, char **argv)
}
- readlen = meminfo.oobblock;
+ readlen = meminfo.writesize;
if (pad && (imglen < readlen))
{
readlen = imglen;
- memset(writebuf + readlen, 0xff, meminfo.oobblock - readlen);
+ memset(writebuf + readlen, 0xff, meminfo.writesize - readlen);
}
/* Read Page Data from input file */
@@ -428,12 +428,12 @@ int main(int argc, char **argv)
}
/* Write out the Page data */
- if (pwrite(fd, writebuf, meminfo.oobblock, mtdoffset) != meminfo.oobblock) {
+ if (pwrite(fd, writebuf, meminfo.writesize, mtdoffset) != meminfo.writesize) {
perror ("pwrite");
goto closeall;
}
imglen -= readlen;
- mtdoffset += meminfo.oobblock;
+ mtdoffset += meminfo.writesize;
}
closeall: