From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
To: openembedded-devel@lists.openembedded.org
Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Subject: [PATCH] nandlogical: corect oobblock/writesize patch
Date: Mon, 5 Sep 2011 04:05:07 +0400 [thread overview]
Message-ID: <1315181107-26857-1-git-send-email-dbaryshkov@gmail.com> (raw)
Somehow the oobblock-to-writesize.patch patch got damaged. Correct it.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
.../nandlogical/oobblock-to-writesize.patch | 74 +++++++++++++-------
1 files changed, 48 insertions(+), 26 deletions(-)
diff --git a/recipes-bsp/zaurus-utils/nandlogical/oobblock-to-writesize.patch b/recipes-bsp/zaurus-utils/nandlogical/oobblock-to-writesize.patch
index 23d011e..2d5aba8 100644
--- a/recipes-bsp/zaurus-utils/nandlogical/oobblock-to-writesize.patch
+++ b/recipes-bsp/zaurus-utils/nandlogical/oobblock-to-writesize.patch
@@ -6,29 +6,51 @@ Fix build against 2.6.24 kernel.
Signed off by Stanislav Brabec <utx@penguin.cz>
Signed off by Andrea Adami <andrea.adami@gmail.com>
---- a/nandlogical.c 2006-06-09 17:06:48.000000000 +0200
-+++ b/nandlogical.c 2011-08-05 11:17:28.000000000 +0200
-138c138
-< //ret = nand_read_raw(nand, oobuf, offset, nand->oobblock, nand->oobsize);
----
-> //ret = nand_read_raw(nand, oobuf, offset, nand->writesize, nand->oobsize);
-279,281c279,281
-< if (!(meminfo.oobsize == 64 && meminfo.oobblock == 2048) &&
-< !(meminfo.oobsize == 16 && meminfo.oobblock == 512) &&
-< !(meminfo.oobsize == 8 && meminfo.oobblock == 256)) {
----
-> if (!(meminfo.oobsize == 64 && meminfo.writesize == 2048) &&
-> !(meminfo.oobsize == 16 && meminfo.writesize == 512) &&
-> !(meminfo.oobsize == 8 && meminfo.writesize == 256)) {
-287c287
-< //printf("erasesize %x\noobblock %x\noobsize %x\nsize %x\n", meminfo.erasesize, meminfo.oobblock, meminfo.oobsize, meminfo.size);
----
-> //printf("erasesize %x\nwritesize %x\noobsize %x\nsize %x\n", meminfo.erasesize, meminfo.writesize, meminfo.oobsize, meminfo.size);
-292c292
-< oobbuf = (char *)malloc(meminfo.oobblock);
----
-> oobbuf = (char *)malloc(meminfo.writesize);
-300c300
-< bs = meminfo.oobblock;
----
-> bs = meminfo.writesize;
+Index: survive-1.1.0/nandlogical.c
+===================================================================
+--- survive-1.1.0.orig/nandlogical.c 2006-06-09 19:06:48.000000000 +0400
++++ survive-1.1.0/nandlogical.c 2011-09-05 04:00:37.000000000 +0400
+@@ -135,7 +135,7 @@
+ oob.start = offset;
+ ret = ioctl(fd, MEMREADOOB, &oob);
+
+- //ret = nand_read_raw(nand, oobuf, offset, nand->oobblock, nand->oobsize);
++ //ret = nand_read_raw(nand, oobuf, offset, nand->writesize, nand->oobsize);
+ if (!ret) {
+ int log_no = nand_get_logical_no(oobbuf);
+ if (((int)log_no >= 0) && (log_no < blocks)) {
+@@ -276,20 +276,20 @@
+ }
+
+ /* Make sure device page sizes are valid */
+- if (!(meminfo.oobsize == 64 && meminfo.oobblock == 2048) &&
+- !(meminfo.oobsize == 16 && meminfo.oobblock == 512) &&
+- !(meminfo.oobsize == 8 && meminfo.oobblock == 256)) {
++ if (!(meminfo.oobsize == 64 && meminfo.writesize == 2048) &&
++ !(meminfo.oobsize == 16 && meminfo.writesize == 512) &&
++ !(meminfo.oobsize == 8 && meminfo.writesize == 256)) {
+ fprintf(stderr, "Unknown flash (not normal NAND)\n");
+ close(fd);
+ exit(1);
+ }
+
+- //printf("erasesize %x\noobblock %x\noobsize %x\nsize %x\n", meminfo.erasesize, meminfo.oobblock, meminfo.oobsize, meminfo.size);
++ //printf("erasesize %x\nwritesize %x\noobsize %x\nsize %x\n", meminfo.erasesize, meminfo.writesize, meminfo.oobsize, meminfo.size);
+
+ blocks = NAND_LOGICAL_SIZE / meminfo.erasesize;
+ log2phy = (unsigned long *) malloc(blocks * sizeof(unsigned long));
+ readbuf = (char *)malloc(meminfo.erasesize);
+- oobbuf = (char *)malloc(meminfo.oobblock);
++ oobbuf = (char *)malloc(meminfo.writesize);
+ oob.ptr = oobbuf;
+
+ scan_logical(blocks, meminfo.erasesize);
+@@ -297,7 +297,7 @@
+ //printf("Start: %x\nEnd: %x\n", start_addr, length);
+
+ end_addr = start_addr + length;
+- bs = meminfo.oobblock;
++ bs = meminfo.writesize;
+
+ for (ofs = start_addr; ofs < end_addr ; ofs+=bs) {
+ int new_logical_added = 0;
--
1.7.2.5
next reply other threads:[~2011-09-05 0:10 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-05 0:05 Dmitry Eremin-Solenikov [this message]
2011-09-05 0:22 ` [PATCH] nandlogical: corect oobblock/writesize patch Paul Eggleton
2011-09-05 20:49 ` Dmitry Eremin-Solenikov
2011-09-05 23:39 ` Paul Eggleton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1315181107-26857-1-git-send-email-dbaryshkov@gmail.com \
--to=dbaryshkov@gmail.com \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox