summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/mtd/mtd-utils/mtd-utils-fix-corrupt-cleanmarker-with-flash_erase--j-command.patch22
-rw-r--r--meta/recipes-devtools/mtd/mtd-utils_git.bb1
2 files changed, 14 insertions, 9 deletions
diff --git a/meta/recipes-devtools/mtd/mtd-utils/mtd-utils-fix-corrupt-cleanmarker-with-flash_erase--j-command.patch b/meta/recipes-devtools/mtd/mtd-utils/mtd-utils-fix-corrupt-cleanmarker-with-flash_erase--j-command.patch
index a66087e301..7207cfcb3a 100644
--- a/meta/recipes-devtools/mtd/mtd-utils/mtd-utils-fix-corrupt-cleanmarker-with-flash_erase--j-command.patch
+++ b/meta/recipes-devtools/mtd/mtd-utils/mtd-utils-fix-corrupt-cleanmarker-with-flash_erase--j-command.patch
@@ -36,6 +36,10 @@ JFFS2: Erase block at 0x00028000 is not formatted. It will be erased
36Signed-off-by: Liu Shuo <b35362@freescale.com> 36Signed-off-by: Liu Shuo <b35362@freescale.com>
37Signed-off-by: Li Yang <leoli@freescale.com> 37Signed-off-by: Li Yang <leoli@freescale.com>
38 38
39Updated for the new version
40
41Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
42
39--- 43---
40v2 : get length of availble freeoob bytes from oobinfo information, 44v2 : get length of availble freeoob bytes from oobinfo information,
41 not use the ioctl ECCGETLAYOUT which is being deprecated. 45 not use the ioctl ECCGETLAYOUT which is being deprecated.
@@ -44,18 +48,18 @@ v2 : get length of availble freeoob bytes from oobinfo information,
44 1 files changed, 39 insertions(+), 7 deletions(-) 48 1 files changed, 39 insertions(+), 7 deletions(-)
45 49
46diff --git a/flash_erase.c b/flash_erase.c 50diff --git a/flash_erase.c b/flash_erase.c
47index fe2eaca..3e94495 100644 51index 933373a..4b9d84b 100644
48--- a/flash_erase.c 52--- a/flash_erase.c
49+++ b/flash_erase.c 53+++ b/flash_erase.c
50@@ -98,6 +98,7 @@ int main(int argc, char *argv[]) 54@@ -99,6 +99,7 @@ int main(int argc, char *argv[])
51 int isNAND; 55 bool isNAND;
52 int error = 0; 56 int error = 0;
53 uint64_t offset = 0; 57 off_t offset = 0;
54+ void *oob_data = NULL; 58+ void *oob_data = NULL;
55 59
56 /* 60 /*
57 * Process user arguments 61 * Process user arguments
58@@ -197,15 +198,43 @@ int main(int argc, char *argv[]) 62@@ -201,15 +202,43 @@ int main(int argc, char *argv[])
59 if (ioctl(fd, MEMGETOOBSEL, &oobinfo) != 0) 63 if (ioctl(fd, MEMGETOOBSEL, &oobinfo) != 0)
60 return sys_errmsg("%s: unable to get NAND oobinfo", mtd_device); 64 return sys_errmsg("%s: unable to get NAND oobinfo", mtd_device);
61 65
@@ -104,7 +108,7 @@ index fe2eaca..3e94495 100644
104 } else { 108 } else {
105 /* Legacy mode */ 109 /* Legacy mode */
106 switch (mtd.oob_size) { 110 switch (mtd.oob_size) {
107@@ -223,7 +252,6 @@ int main(int argc, char *argv[]) 111@@ -227,7 +256,6 @@ int main(int argc, char *argv[])
108 break; 112 break;
109 } 113 }
110 } 114 }
@@ -112,13 +116,13 @@ index fe2eaca..3e94495 100644
112 } 116 }
113 cleanmarker.hdr_crc = cpu_to_je32(mtd_crc32(0, &cleanmarker, sizeof(cleanmarker) - 4)); 117 cleanmarker.hdr_crc = cpu_to_je32(mtd_crc32(0, &cleanmarker, sizeof(cleanmarker) - 4));
114 } 118 }
115@@ -272,7 +300,8 @@ int main(int argc, char *argv[]) 119@@ -276,7 +304,8 @@ int main(int argc, char *argv[])
116 120
117 /* write cleanmarker */ 121 /* write cleanmarker */
118 if (isNAND) { 122 if (isNAND) {
119- if (mtd_write_oob(mtd_desc, &mtd, fd, offset + clmpos, clmlen, &cleanmarker) != 0) { 123- if (mtd_write_oob(mtd_desc, &mtd, fd, (uint64_t)offset + clmpos, clmlen, &cleanmarker) != 0) {
120+ void *data = oob_data ? oob_data + clmpos : &cleanmarker; 124+ void *data = oob_data ? oob_data + clmpos : &cleanmarker;
121+ if (mtd_write_oob(mtd_desc, &mtd, fd, offset + clmpos, clmlen, data) != 0) { 125+ if (mtd_write_oob(mtd_desc, &mtd, fd, (uint64_t)offset + clmpos, clmlen, data) != 0) {
122 sys_errmsg("%s: MTD writeoob failure", mtd_device); 126 sys_errmsg("%s: MTD writeoob failure", mtd_device);
123 continue; 127 continue;
124 } 128 }
diff --git a/meta/recipes-devtools/mtd/mtd-utils_git.bb b/meta/recipes-devtools/mtd/mtd-utils_git.bb
index f991ea17c3..7010cac145 100644
--- a/meta/recipes-devtools/mtd/mtd-utils_git.bb
+++ b/meta/recipes-devtools/mtd/mtd-utils_git.bb
@@ -14,6 +14,7 @@ SRC_URI = "git://git.infradead.org/mtd-utils.git \
14 file://add-exclusion-to-mkfs-jffs2-git-2.patch \ 14 file://add-exclusion-to-mkfs-jffs2-git-2.patch \
15 file://fix-armv7-neon-alignment.patch \ 15 file://fix-armv7-neon-alignment.patch \
16 file://0001-hashtable-Remove-duplicate-hashtable_iterator_value-.patch \ 16 file://0001-hashtable-Remove-duplicate-hashtable_iterator_value-.patch \
17 file://mtd-utils-fix-corrupt-cleanmarker-with-flash_erase--j-command.patch \
17" 18"
18 19
19S = "${WORKDIR}/git/" 20S = "${WORKDIR}/git/"