From af5fd7146d178fdcbb7949280db1bbc4647003db Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sun, 18 Feb 2018 19:21:19 -0300 Subject: 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 Signed-off-by: Ross Burton --- .../mtd/mtd-utils/fix-armv7-neon-alignment.patch | 55 ---------------------- 1 file changed, 55 deletions(-) delete mode 100644 meta/recipes-devtools/mtd/mtd-utils/fix-armv7-neon-alignment.patch (limited to 'meta/recipes-devtools/mtd/mtd-utils/fix-armv7-neon-alignment.patch') diff --git a/meta/recipes-devtools/mtd/mtd-utils/fix-armv7-neon-alignment.patch b/meta/recipes-devtools/mtd/mtd-utils/fix-armv7-neon-alignment.patch deleted file mode 100644 index 6fc594f00b..0000000000 --- a/meta/recipes-devtools/mtd/mtd-utils/fix-armv7-neon-alignment.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 7d026a85946a08b8167dcd792ea6660bf6a49e08 Mon Sep 17 00:00:00 2001 -From: Yuanjie Huang -Date: Thu, 2 Mar 2017 10:43:56 +0100 -Subject: [PATCH] Fix alignment trap triggered by NEON instructions - -NEON instruction VLD1.64 was used to copy 64 bits data after type -casting, and they will trigger alignment trap. -This patch uses memcpy to avoid alignment problem. - -Upstream-Status: Backport - -Signed-off-by: Yuanjie Huang -Signed-off-by: David Oberhollenzer ---- - ubifs-utils/mkfs.ubifs/key.h | 16 ++++++++++------ - 1 file changed, 10 insertions(+), 6 deletions(-) - -diff --git a/ubifs-utils/mkfs.ubifs/key.h b/ubifs-utils/mkfs.ubifs/key.h -index 39379fd..118858b 100644 ---- a/ubifs-utils/mkfs.ubifs/key.h -+++ b/ubifs-utils/mkfs.ubifs/key.h -@@ -159,10 +159,12 @@ static inline void data_key_init(union ubifs_key *key, ino_t inum, - */ - static inline void key_write(const union ubifs_key *from, void *to) - { -- union ubifs_key *t = to; -+ __le32 x[2]; - -- t->j32[0] = cpu_to_le32(from->u32[0]); -- t->j32[1] = cpu_to_le32(from->u32[1]); -+ x[0] = cpu_to_le32(from->u32[0]); -+ x[1] = cpu_to_le32(from->u32[1]); -+ -+ memcpy(to, &x, 8); - memset(to + 8, 0, UBIFS_MAX_KEY_LEN - 8); - } - -@@ -174,10 +176,12 @@ static inline void key_write(const union ubifs_key *from, void *to) - */ - static inline void key_write_idx(const union ubifs_key *from, void *to) - { -- union ubifs_key *t = to; -+ __le32 x[2]; -+ -+ x[0] = cpu_to_le32(from->u32[0]); -+ x[1] = cpu_to_le32(from->u32[1]); - -- t->j32[0] = cpu_to_le32(from->u32[0]); -- t->j32[1] = cpu_to_le32(from->u32[1]); -+ memcpy(to, &x, 8); - } - - /** --- -2.6.1 -- cgit 1.2.3-korg