diff options
author | Dongxiao Xu <dongxiao.xu@intel.com> | 2010-11-18 20:02:31 +0800 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-11-22 10:25:33 +0000 |
commit | 9cc3ea6579267a1ec1433954196d7ed0929dc056 (patch) | |
tree | 30b1b0e93302f150a27dfb8473cd2adc4208b487 | |
parent | a2ede09151032b5f5df584d085d599ed6bffb3e0 (diff) | |
download | poky-9cc3ea6579267a1ec1433954196d7ed0929dc056.tar.gz |
mtd-utils: Upgrade to version 1.4.1
Remove add-oobsize-64-and-writesize-4096-as-normal-nand.patch
since the original code logic no longer exists.
Do not include fix-ignoreerrors-git.patch since variable
"ignoreerrors" is not defined in current code.
Fix recipe metadata.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
-rw-r--r-- | meta/recipes-devtools/mtd/mtd-utils-1.3.1/add-oobsize-64-and-writesize-4096-as-normal-nand.patch | 24 | ||||
-rw-r--r-- | meta/recipes-devtools/mtd/mtd-utils-1.4.1/add-exclusion-to-mkfs-jffs2-git-2.patch (renamed from meta/recipes-devtools/mtd/mtd-utils-1.3.1/add-exclusion-to-mkfs-jffs2-git-2.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-devtools/mtd/mtd-utils_1.4.1.bb (renamed from meta/recipes-devtools/mtd/mtd-utils_1.3.1.bb) | 13 |
3 files changed, 9 insertions, 28 deletions
diff --git a/meta/recipes-devtools/mtd/mtd-utils-1.3.1/add-oobsize-64-and-writesize-4096-as-normal-nand.patch b/meta/recipes-devtools/mtd/mtd-utils-1.3.1/add-oobsize-64-and-writesize-4096-as-normal-nand.patch deleted file mode 100644 index 64f25f79e1..0000000000 --- a/meta/recipes-devtools/mtd/mtd-utils-1.3.1/add-oobsize-64-and-writesize-4096-as-normal-nand.patch +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | Index: git/nanddump.c | ||
2 | =================================================================== | ||
3 | --- git.orig/nanddump.c 2010-04-29 10:24:15.000000000 +0200 | ||
4 | +++ git/nanddump.c 2010-04-29 10:28:45.000000000 +0200 | ||
5 | @@ -210,6 +210,7 @@ | ||
6 | |||
7 | /* Make sure device page sizes are valid */ | ||
8 | if (!(meminfo.oobsize == 128 && meminfo.writesize == 4096) && | ||
9 | + !(meminfo.oobsize == 64 && meminfo.writesize == 4096) && | ||
10 | !(meminfo.oobsize == 64 && meminfo.writesize == 2048) && | ||
11 | !(meminfo.oobsize == 32 && meminfo.writesize == 1024) && | ||
12 | !(meminfo.oobsize == 16 && meminfo.writesize == 512) && | ||
13 | Index: git/nandwrite.c | ||
14 | =================================================================== | ||
15 | --- git.orig/nandwrite.c 2010-04-29 09:59:30.000000000 +0200 | ||
16 | +++ git/nandwrite.c 2010-04-29 10:27:51.000000000 +0200 | ||
17 | @@ -294,6 +294,7 @@ | ||
18 | if (!(meminfo.oobsize == 16 && meminfo.writesize == 512) && | ||
19 | !(meminfo.oobsize == 8 && meminfo.writesize == 256) && | ||
20 | !(meminfo.oobsize == 64 && meminfo.writesize == 2048) && | ||
21 | + !(meminfo.oobsize == 64 && meminfo.writesize == 4096) && | ||
22 | !(meminfo.oobsize == 128 && meminfo.writesize == 4096)) { | ||
23 | fprintf(stderr, "Unknown flash (not normal NAND)\n"); | ||
24 | close(fd); | ||
diff --git a/meta/recipes-devtools/mtd/mtd-utils-1.3.1/add-exclusion-to-mkfs-jffs2-git-2.patch b/meta/recipes-devtools/mtd/mtd-utils-1.4.1/add-exclusion-to-mkfs-jffs2-git-2.patch index fb776fddce..fb776fddce 100644 --- a/meta/recipes-devtools/mtd/mtd-utils-1.3.1/add-exclusion-to-mkfs-jffs2-git-2.patch +++ b/meta/recipes-devtools/mtd/mtd-utils-1.4.1/add-exclusion-to-mkfs-jffs2-git-2.patch | |||
diff --git a/meta/recipes-devtools/mtd/mtd-utils_1.3.1.bb b/meta/recipes-devtools/mtd/mtd-utils_1.4.1.bb index faa2332a25..8189bffae3 100644 --- a/meta/recipes-devtools/mtd/mtd-utils_1.3.1.bb +++ b/meta/recipes-devtools/mtd/mtd-utils_1.4.1.bb | |||
@@ -2,15 +2,17 @@ DESCRIPTION = "Tools for managing memory technology devices." | |||
2 | SECTION = "base" | 2 | SECTION = "base" |
3 | DEPENDS = "zlib lzo e2fsprogs util-linux" | 3 | DEPENDS = "zlib lzo e2fsprogs util-linux" |
4 | HOMEPAGE = "http://www.linux-mtd.infradead.org/" | 4 | HOMEPAGE = "http://www.linux-mtd.infradead.org/" |
5 | LICENSE = "GPLv2" | 5 | LICENSE = "GPLv2+" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ | ||
7 | file://include/common.h;beginline=1;endline=17;md5=ba05b07912a44ea2bf81ce409380049c" | ||
6 | 8 | ||
7 | SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=v${PV} \ | 9 | SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=v${PV} \ |
8 | file://add-exclusion-to-mkfs-jffs2-git-2.patch;patch=1 \ | 10 | file://add-exclusion-to-mkfs-jffs2-git-2.patch;patch=1" |
9 | file://fix-ignoreerrors-git.patch;patch=1 \ | ||
10 | file://add-oobsize-64-and-writesize-4096-as-normal-nand.patch;patch=1" | ||
11 | 11 | ||
12 | S = "${WORKDIR}/git/" | 12 | S = "${WORKDIR}/git/" |
13 | 13 | ||
14 | PR = "r0" | ||
15 | |||
14 | EXTRA_OEMAKE = "'CC=${CC}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR' 'BUILDDIR=${S}'" | 16 | EXTRA_OEMAKE = "'CC=${CC}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR' 'BUILDDIR=${S}'" |
15 | 17 | ||
16 | do_install () { | 18 | do_install () { |
@@ -24,3 +26,6 @@ do_install () { | |||
24 | PARALLEL_MAKE = "" | 26 | PARALLEL_MAKE = "" |
25 | 27 | ||
26 | BBCLASSEXTEND = "native" | 28 | BBCLASSEXTEND = "native" |
29 | |||
30 | SRC_URI[md5sum] = "645519b753b364d52c4b941dcee3dd7e" | ||
31 | SRC_URI[sha256sum] = "51d6a77c7e673219bb89c4b119f336d9f2f5a5e065a12ecf9636c5348d099a0e" | ||