diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2018-02-18 19:21:19 -0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-02-24 10:31:35 +0000 |
commit | af5fd7146d178fdcbb7949280db1bbc4647003db (patch) | |
tree | 3738b5b9f04c87e259aa06b2d70cdc26e0a0975c /meta/recipes-devtools/mtd/mtd-utils/mtd-utils-fix-corrupt-cleanmarker-with-flash_erase--j-command.patch | |
parent | 8f9d6f92edb5682a7f2012af6466dbcd19e2e422 (diff) | |
download | openembedded-core-contrib-af5fd7146d178fdcbb7949280db1bbc4647003db.tar.gz |
mtd-utils: Bump revision to 1bfee866
This bumps the version to 2.0.1 release plus some more changes.
The following patches were merged upstream:
- 0001-Fix-build-with-musl.patch
- 010-fix-rpmatch.patch
- fix-armv7-neon-alignment.patch
The `mtd-utils-fix-corrupt-cleanmarker-with-flash_erase--j-command.patch`
patch has been removed as the issue seems to have been addressed
in the Linux MTD subsystem. The discussion can be seen at:
http://lists.infradead.org/pipermail/linux-mtd/2011-August/037320.html
Also a research to see if any other distribution had a similar patch
included and they don't. So there is no clear need to keep diverging
from upstream.
See the logs below:
,----[ Changes from 2.0.0 -> 2.0.1 ]
| 81049e5 Release mtd-utils-2.0.1
| 4458ad6 mtd-utils: tests: Avoid using less than two blocks in nandpagetest
| 76a55b1 mtd-utils: ubinfo: add parameter check
| 454a3d0 mkfs-ubifs: fix inclusion of uuid.h
| df913e4 mtd-utils: tests: Add Erased Pages Bit Flip Test
| f8bc7d9 Add const modifier to read only strings and string constants
| a7c8cb3 Silence warnings about unused arguments
| e511691 Remove unused variables and functions
| ca517e8 Eliminate warnings about missing prototypes
| 3029b65 Enable compiler warnings
| 9eae306 Move libfec declarations to public header in global include directory
| 022ce62 Use autoconf header detection correctly for libmissing
| 1a3e3af Restructure autoconf configure.ac
| e772dc8 Replace defunct ubifs_assert
| b0b1bc5 mtd-utils: tests: Fix nandbiterrs Failure Check
| 76e27a7 ubi-utils: Return error code if command line option is unknown
| b8e785a nor-utils: Return error code if command line option is unknown
| 12e27a1 jffsX-utils: Return error code if command line option is unknown
| 9a357ee ftl_format: Use return directly to leave main function
| 6890608 flashcp: Drop exit code defines
| ccffc10 Use defines for exit code values
| 871c2f1 mkfs.ubifs: Add support for symlinks in device table
| c0972a5 libiniparser: remove unused function needing float
| 5c57076 libubi.c: add klibc specific fixes for ioctl
| dede98f Return correct error number in ubi_get_vol_info1
| a2eeedb Fix libmtd behaviour if MTD is not present on the system
| 4dab9be Fix build with musl
| 82839c3 Replace rpmatch() usage with checking first character of line
| 7d026a8 Fix alignment trap triggered by NEON instructions
| d7e8612 mtd-utils: Support jffs2 flash-erase for large OOB (>32b)
| fc7aa01 ubi: tests: Speedup io_paral by using rand_r()
| fdec8a4 ubi: tests: Support up to 65k NAND page size
| d600419 ubi: tests: Replace variable-length array with malloc()
| 1710e0c Remove README.udev from ubi-tests extra dist
| e3e010c ubirename: trivial fixes to the help text
| 1fed9b4 Remove UDEV_SETTLE_HACK
| 22089b0 mtd-utils: serve_image: Use PRIdoff_t as format specifier.
| 5a80691 mtd-utils: Fix format specifier definitions for off_t and loff_t.
| 44558d1 nanddump: Add --skip-bad-blocks-to-start option
| 2fc8058 nandwrite: Add --skip-bad-blocks-to-start option
| 6df83fd nandwrite: fix/cleanup bad block skipping
| 7b8981a nandwrite: replace erase loop with mtd_erase_multi
| dffaa1d nandwrite: add stricter sanity checking for blockalign
`----
,----[ Changes from 2.0.1 -> 9c61735 ]
| 9c61735 mtd: unittests: Stop testing stat() calls
| daef4f1 mtd: unittests: Decode arg size from ioctl request
| fd0b70b mtd: unittests: Use proper unsigned long type for ioctl requests
| c75d104 ubi-utils: ubiformat.c: convert to integer arithmetic
| 61afcc6 mtd-utils: common.c: convert to integer arithmetic
| 6766178 Run unit test programs through "make check"
| 098e91a mtd: tests: Fix check on ebcnt in nandpagetest
| 9cfb02c libscan: fix a comment typo in libscan.h
| 7086393 libmtd: fix a comment typo in dev_node2num
| 3c54e4e ubi-utils: ubicrc32: process command line arguments first
| ce50e6d nandbiterrs: Fix copy & paste fail
| 03dafe3 Enable further warning flags, address new warnings
| 0555cb2 jittertest: Use the appropriate versions of abs()
| 475bf70 Mark or fix switch cases that fall through
| cb2fcfc Add no-return attribute to usage() style functions
| 81fd176 Remove self-assignments of unused paramters
| 3b421ab mkfs.ubifs: ignore EOPNOTSUPP when listing extended attributes
| 030a63b tests: checkfs: Remove unused source file from makefiles
| 40dd609 misc-utils: initialize "ip" in docfdisk to NULL
| 94f6573 ubi-tests: io_update: fix missleading indentation
| afba4fc mkfs.ubifs: Apply squash-uids to the root node
| 3a34784 Add ctags files to .gitignore
`----
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-devtools/mtd/mtd-utils/mtd-utils-fix-corrupt-cleanmarker-with-flash_erase--j-command.patch')
-rw-r--r-- | meta/recipes-devtools/mtd/mtd-utils/mtd-utils-fix-corrupt-cleanmarker-with-flash_erase--j-command.patch | 137 |
1 files changed, 0 insertions, 137 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 deleted file mode 100644 index 0f42e73e9a..0000000000 --- a/meta/recipes-devtools/mtd/mtd-utils/mtd-utils-fix-corrupt-cleanmarker-with-flash_erase--j-command.patch +++ /dev/null @@ -1,137 +0,0 @@ -Upstream-Status: Pending -From patchwork Mon Aug 8 08:16:43 2011 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: mtd-utils: fix corrupt cleanmarker with flash_erase -j command -Date: Sun, 07 Aug 2011 22:16:43 -0000 -From: b35362@freescale.com -X-Patchwork-Id: 108873 -Message-Id: <1312791403-13473-1-git-send-email-b35362@freescale.com> -To: <dwmw2@infradead.org> -Cc: Liu Shuo <b35362@freescale.com>, Artem.Bityutskiy@nokia.com, - Li Yang <leoli@freescale.com>, linux-mtd@lists.infradead.org - -From: Liu Shuo <b35362@freescale.com> - -Flash_erase -j should fill discrete freeoob areas with required bytes -of JFFS2 cleanmarker in jffs2_check_nand_cleanmarker(). Not just fill -the first freeoob area. - -The below is the result without this workaround: - -JFFS2: Erase block at 0x00000000 is not formatted. It will be erased -JFFS2: Erase block at 0x00004000 is not formatted. It will be erased -JFFS2: Erase block at 0x00008000 is not formatted. It will be erased -JFFS2: Erase block at 0x0000c000 is not formatted. It will be erased -JFFS2: Erase block at 0x00010000 is not formatted. It will be erased -JFFS2: Erase block at 0x00014000 is not formatted. It will be erased -JFFS2: Erase block at 0x00018000 is not formatted. It will be erased -JFFS2: Erase block at 0x0001c000 is not formatted. It will be erased -JFFS2: Erase block at 0x00020000 is not formatted. It will be erased -JFFS2: Erase block at 0x00024000 is not formatted. It will be erased -JFFS2: Erase block at 0x00028000 is not formatted. It will be erased -... - -Signed-off-by: Liu Shuo <b35362@freescale.com> -Signed-off-by: Li Yang <leoli@freescale.com> - -Updated for the new version - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> - ---- -v2 : get length of availble freeoob bytes from oobinfo information, - not use the ioctl ECCGETLAYOUT which is being deprecated. - - flash_erase.c | 46 +++++++++++++++++++++++++++++++++++++++------- - 1 files changed, 39 insertions(+), 7 deletions(-) - -diff --git a/flash_erase.c b/flash_erase.c -index 933373a..4b9d84b 100644 ---- a/misc-utils/flash_erase.c -+++ b/misc-utils/flash_erase.c -@@ -99,6 +99,7 @@ int main(int argc, char *argv[]) - bool isNAND; - int error = 0; - off_t offset = 0; -+ void *oob_data = NULL; - - /* - * Process user arguments -@@ -201,15 +202,43 @@ int main(int argc, char *argv[]) - if (ioctl(fd, MEMGETOOBSEL, &oobinfo) != 0) - return sys_errmsg("%s: unable to get NAND oobinfo", mtd_device); - -+ cleanmarker.totlen = cpu_to_je32(8); - /* Check for autoplacement */ - if (oobinfo.useecc == MTD_NANDECC_AUTOPLACE) { -- /* Get the position of the free bytes */ -- if (!oobinfo.oobfree[0][1]) -+ struct nand_ecclayout_user ecclayout; -+ int i, oobavail; -+ -+ for (i = 0, oobavail = 0; oobinfo.oobfree[i][1]; i++) -+ oobavail += oobinfo.oobfree[i][1]; -+ -+ if (!oobavail) - return errmsg(" Eeep. Autoplacement selected and no empty space in oob"); -+ -+ /* Get the position of the free bytes */ - clmpos = oobinfo.oobfree[0][0]; -- clmlen = oobinfo.oobfree[0][1]; -- if (clmlen > 8) -- clmlen = 8; -+ clmlen = MIN(oobavail, 8); -+ -+ if (oobinfo.oobfree[0][1] < 8 && oobavail >= 8) { -+ int left, n, last = 0; -+ void *cm; -+ -+ oob_data = malloc(mtd.oob_size); -+ if (!oob_data) -+ return -ENOMEM; -+ -+ memset(oob_data, 0xff, mtd.oob_size); -+ cm = &cleanmarker; -+ for (i = 0, left = clmlen; left ; i++) { -+ n = MIN(left, oobinfo.oobfree[i][1]); -+ memcpy(oob_data + oobinfo.oobfree[i][0], -+ cm, n); -+ left -= n; -+ cm += n; -+ last = oobinfo.oobfree[i][0] + n; -+ } -+ -+ clmlen = last - clmpos; -+ } - } else { - /* Legacy mode */ - switch (mtd.oob_size) { -@@ -227,7 +256,6 @@ int main(int argc, char *argv[]) - break; - } - } -- cleanmarker.totlen = cpu_to_je32(8); - } - cleanmarker.hdr_crc = cpu_to_je32(mtd_crc32(0, &cleanmarker, sizeof(cleanmarker) - 4)); - } -@@ -276,7 +304,8 @@ int main(int argc, char *argv[]) - - /* write cleanmarker */ - if (isNAND) { -- if (mtd_write_oob(mtd_desc, &mtd, fd, (uint64_t)offset + clmpos, clmlen, &cleanmarker) != 0) { -+ void *data = oob_data ? oob_data + clmpos : &cleanmarker; -+ if (mtd_write_oob(mtd_desc, &mtd, fd, (uint64_t)offset + clmpos, clmlen, data) != 0) { - sys_errmsg("%s: MTD writeoob failure", mtd_device); - continue; - } -@@ -291,5 +320,8 @@ int main(int argc, char *argv[]) - show_progress(&mtd, offset, eb, eb_start, eb_cnt); - bareverbose(!quiet, "\n"); - -+ if (oob_data) -+ free(oob_data); -+ - return 0; - } |