diff options
author | Robert Schwebel <r.schwebel@pengutronix.de> | 2011-09-02 13:34:27 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-09-08 16:15:41 +0200 |
commit | 85c72f63e7a1d9d1cf9d0b844b934ad970ce3702 (patch) | |
tree | 97dc9df8f657434dda933e55fe8a845f9038b793 | |
parent | 16d96812048609e608cf90b7bf3ff585d9bacedc (diff) | |
download | ptxdist-85c72f63e7a1d9d1cf9d0b844b934ad970ce3702.tar.gz ptxdist-85c72f63e7a1d9d1cf9d0b844b934ad970ce3702.tar.xz |
mtd-utils: version bump 1.3.1 -> 1.4.6
Added all new tools and compile-tested on arm, powerpc and x86.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r-- | patches/mtd-utils-1.3.1/0002-make-mkubifs-optional.patch | 29 | ||||
-rw-r--r-- | patches/mtd-utils-1.3.1/0003-don-t-build-ubi-utils-old-utils-with-Werror.patch | 31 | ||||
-rw-r--r-- | patches/mtd-utils-1.3.1/series | 5 | ||||
-rw-r--r-- | patches/mtd-utils-1.4.6/0001-make-liblzo-optional.patch (renamed from patches/mtd-utils-1.3.1/0001-make-liblzo-optional.patch) | 84 | ||||
-rw-r--r-- | patches/mtd-utils-1.4.6/0002-make-mkubifs-optional.patch | 26 | ||||
-rw-r--r-- | patches/mtd-utils-1.4.6/series | 2 | ||||
-rw-r--r-- | rules/mtd-utils.in | 68 | ||||
-rw-r--r-- | rules/mtd-utils.make | 50 |
8 files changed, 175 insertions, 120 deletions
diff --git a/patches/mtd-utils-1.3.1/0002-make-mkubifs-optional.patch b/patches/mtd-utils-1.3.1/0002-make-mkubifs-optional.patch deleted file mode 100644 index 707b677ac..000000000 --- a/patches/mtd-utils-1.3.1/0002-make-mkubifs-optional.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Ladislav Michl <ladis@linux-mips.org> -Date: Tue, 3 Aug 2010 13:00:00 +0200 -Subject: [PATCH] make mkubifs optional - -Signed-off-by: Ladislav Michl <ladis@linux-mips.org> ---- - Makefile | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -diff --git a/Makefile b/Makefile -index 5de9382..462a8f9 100644 ---- a/Makefile -+++ b/Makefile -@@ -11,7 +11,11 @@ ifeq ($(WITHOUT_LZO), 1) - CPPFLAGS += -DWITHOUT_LZO - endif - --SUBDIRS = ubi-utils mkfs.ubifs -+SUBDIRS = ubi-utils -+ -+ifneq ($(WITHOUT_MKUBIFS), 1) -+ SUBDIRS += mkfs.ubifs -+endif - - TARGETS = ftl_format flash_erase flash_eraseall nanddump doc_loadbios \ - ftl_check mkfs.jffs2 flash_lock flash_unlock flash_info \ --- -1.7.1 - diff --git a/patches/mtd-utils-1.3.1/0003-don-t-build-ubi-utils-old-utils-with-Werror.patch b/patches/mtd-utils-1.3.1/0003-don-t-build-ubi-utils-old-utils-with-Werror.patch deleted file mode 100644 index 0e9dbc879..000000000 --- a/patches/mtd-utils-1.3.1/0003-don-t-build-ubi-utils-old-utils-with-Werror.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Sat, 12 Feb 2011 21:34:12 +0100 -Subject: [PATCH] don't build ubi-utils/old-utils with -Werror - -gcc 4.5 generates a warning: - -cc1: warnings being treated as errors -./src/libubigen.c: In function 'ubigen_write_leb': -./src/libubigen.c:204:19: error: operation on 'u->v->copy_flag' may be undefined - -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> ---- - ubi-utils/old-utils/Makefile | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/ubi-utils/old-utils/Makefile b/ubi-utils/old-utils/Makefile -index acdb31a..6df7c06 100644 ---- a/ubi-utils/old-utils/Makefile -+++ b/ubi-utils/old-utils/Makefile -@@ -4,7 +4,7 @@ - - KERNELHDR := ../../include - --CFLAGS ?= -O2 -g -Werror -+CFLAGS ?= -O2 -g - CPPFLAGS := -I./inc -I./src -I$(KERNELHDR) \ - -std=gnu99 -DPACKAGE_VERSION=\"1.0\" $(CPPFLAGS) - --- -1.7.2.3 - diff --git a/patches/mtd-utils-1.3.1/series b/patches/mtd-utils-1.3.1/series deleted file mode 100644 index a31c45cb0..000000000 --- a/patches/mtd-utils-1.3.1/series +++ /dev/null @@ -1,5 +0,0 @@ -# generated by git-ptx-patches -0001-make-liblzo-optional.patch -0002-make-mkubifs-optional.patch -0003-don-t-build-ubi-utils-old-utils-with-Werror.patch -# 53874729a65c24c7b71ff21ac3a0c71c - git-ptx-patches magic diff --git a/patches/mtd-utils-1.3.1/0001-make-liblzo-optional.patch b/patches/mtd-utils-1.4.6/0001-make-liblzo-optional.patch index e5f6f6eab..00845a13a 100644 --- a/patches/mtd-utils-1.3.1/0001-make-liblzo-optional.patch +++ b/patches/mtd-utils-1.4.6/0001-make-liblzo-optional.patch @@ -4,50 +4,37 @@ Subject: [PATCH] make liblzo optional Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- - Makefile | 13 +++++++++++-- + Makefile | 3 ++- compr.h | 2 ++ mkfs.ubifs/Makefile | 6 +++++- mkfs.ubifs/compr.c | 17 +++++++++++++++++ - 4 files changed, 35 insertions(+), 3 deletions(-) + 4 files changed, 26 insertions(+), 2 deletions(-) -diff --git a/Makefile b/Makefile -index 577634f..5de9382 100644 ---- a/Makefile -+++ b/Makefile -@@ -7,6 +7,10 @@ ifeq ($(WITHOUT_XATTR), 1) - CPPFLAGS += -DWITHOUT_XATTR +Index: mtd-utils-1.4.6/Makefile +=================================================================== +--- mtd-utils-1.4.6.orig/Makefile ++++ mtd-utils-1.4.6/Makefile +@@ -10,6 +10,7 @@ ifeq ($(WITHOUT_LZO), 1) + CPPFLAGS += -DWITHOUT_LZO + else + LZOLDLIBS = -llzo2 ++ JFFS2_COMPR_LZO_O := compr_lzo.o endif -+ifeq ($(WITHOUT_LZO), 1) -+ CPPFLAGS += -DWITHOUT_LZO -+endif -+ - SUBDIRS = ubi-utils mkfs.ubifs - - TARGETS = ftl_format flash_erase flash_eraseall nanddump doc_loadbios \ -@@ -35,11 +39,16 @@ endif - $(SYMLINKS): + SUBDIRS = lib ubi-utils mkfs.ubifs +@@ -50,7 +51,7 @@ $(SYMLINKS): ln -sf ../fs/jffs2/$@ $@ -+ifneq ($(WITHOUT_LZO), 1) -+JFFS2_COMPR_LZO_O := compr_lzo.o -+JFFS2_LIB_LZO := -llzo2 -+endif -+ $(BUILDDIR)/mkfs.jffs2: $(addprefix $(BUILDDIR)/,\ -- crc32.o compr_rtime.o mkfs.jffs2.o compr_zlib.o compr_lzo.o \ -+ crc32.o compr_rtime.o mkfs.jffs2.o compr_zlib.o $(JFFS2_COMPR_LZO_O) \ +- compr_rtime.o mkfs.jffs2.o compr_zlib.o compr_lzo.o \ ++ compr_rtime.o mkfs.jffs2.o compr_zlib.o $(JFFS2_COMPR_LZO_O) \ compr.o rbtree.o) LDFLAGS_mkfs.jffs2 = $(ZLIBLDFLAGS) $(LZOLDFLAGS) --LDLIBS_mkfs.jffs2 = -lz -llzo2 -+LDLIBS_mkfs.jffs2 = -lz $(JFFS2_LIB_LZO) - - $(BUILDDIR)/flash_eraseall: $(BUILDDIR)/crc32.o $(BUILDDIR)/flash_eraseall.o - -diff --git a/compr.h b/compr.h -index 51bf0dd..f373fb6 100644 ---- a/compr.h -+++ b/compr.h + LDLIBS_mkfs.jffs2 = -lz $(LZOLDLIBS) +Index: mtd-utils-1.4.6/compr.h +=================================================================== +--- mtd-utils-1.4.6.orig/compr.h ++++ mtd-utils-1.4.6/compr.h @@ -18,7 +18,9 @@ #define CONFIG_JFFS2_ZLIB @@ -58,10 +45,10 @@ index 51bf0dd..f373fb6 100644 #define JFFS2_RUBINMIPS_PRIORITY 10 #define JFFS2_DYNRUBIN_PRIORITY 20 -diff --git a/mkfs.ubifs/Makefile b/mkfs.ubifs/Makefile -index 61d0e20..870cf81 100644 ---- a/mkfs.ubifs/Makefile -+++ b/mkfs.ubifs/Makefile +Index: mtd-utils-1.4.6/mkfs.ubifs/Makefile +=================================================================== +--- mtd-utils-1.4.6.orig/mkfs.ubifs/Makefile ++++ mtd-utils-1.4.6/mkfs.ubifs/Makefile @@ -6,7 +6,11 @@ ALL_SOURCES=*.[ch] hashtable/*.[ch] TARGETS = mkfs.ubifs @@ -72,17 +59,17 @@ index 61d0e20..870cf81 100644 +endif + +LDLIBS_mkfs.ubifs = -lz $(mkfs.ubifs_LIBLZO) -lm -luuid -L$(BUILDDIR)/../ubi-utils/ -lubi + LDLIBS_mkfs.ubifs += -L$(BUILDDIR)/../lib -lmtd LDLIBS_mkfs.ubifs += $(ZLIBLDFLAGS) $(LZOLDFLAGS) - include ../common.mk -diff --git a/mkfs.ubifs/compr.c b/mkfs.ubifs/compr.c -index e378c5d..55ed1b6 100644 ---- a/mkfs.ubifs/compr.c -+++ b/mkfs.ubifs/compr.c -@@ -25,7 +25,11 @@ +Index: mtd-utils-1.4.6/mkfs.ubifs/compr.c +=================================================================== +--- mtd-utils-1.4.6.orig/mkfs.ubifs/compr.c ++++ mtd-utils-1.4.6/mkfs.ubifs/compr.c +@@ -24,7 +24,11 @@ + #include <stdio.h> #include <stdint.h> #include <string.h> - #include <zlib.h> +#ifndef WITHOUT_LZO #include <lzo/lzo1x.h> +#else @@ -90,8 +77,8 @@ index e378c5d..55ed1b6 100644 +#endif #include <linux/types.h> - #include "compr.h" -@@ -83,6 +87,8 @@ static int zlib_deflate(void *in_buf, size_t in_len, void *out_buf, + #define crc32 __zlib_crc32 +@@ -86,6 +90,8 @@ static int zlib_deflate(void *in_buf, si return 0; } @@ -100,7 +87,7 @@ index e378c5d..55ed1b6 100644 static int lzo_compress(void *in_buf, size_t in_len, void *out_buf, size_t *out_len) { -@@ -100,6 +106,17 @@ static int lzo_compress(void *in_buf, size_t in_len, void *out_buf, +@@ -103,6 +109,17 @@ static int lzo_compress(void *in_buf, si return 0; } @@ -118,6 +105,3 @@ index e378c5d..55ed1b6 100644 static int no_compress(void *in_buf, size_t in_len, void *out_buf, size_t *out_len) --- -1.7.1 - diff --git a/patches/mtd-utils-1.4.6/0002-make-mkubifs-optional.patch b/patches/mtd-utils-1.4.6/0002-make-mkubifs-optional.patch new file mode 100644 index 000000000..23d0111cd --- /dev/null +++ b/patches/mtd-utils-1.4.6/0002-make-mkubifs-optional.patch @@ -0,0 +1,26 @@ +From: Ladislav Michl <ladis@linux-mips.org> +Date: Tue, 3 Aug 2010 13:00:00 +0200 +Subject: [PATCH] make mkubifs optional + +Signed-off-by: Ladislav Michl <ladis@linux-mips.org> +--- + Makefile | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +Index: mtd-utils-1.4.6/Makefile +=================================================================== +--- mtd-utils-1.4.6.orig/Makefile ++++ mtd-utils-1.4.6/Makefile +@@ -13,7 +13,11 @@ else + JFFS2_COMPR_LZO_O := compr_lzo.o + endif + +-SUBDIRS = lib ubi-utils mkfs.ubifs ++SUBDIRS = lib ubi-utils ++ifneq ($(WITHOUT_MKUBIFS), 1) ++ SUBDIRS += mkfs.ubifs ++endif ++ + TESTS = tests + + TARGETS = ftl_format flash_erase nanddump doc_loadbios \ diff --git a/patches/mtd-utils-1.4.6/series b/patches/mtd-utils-1.4.6/series new file mode 100644 index 000000000..488877134 --- /dev/null +++ b/patches/mtd-utils-1.4.6/series @@ -0,0 +1,2 @@ +0001-make-liblzo-optional.patch +0002-make-mkubifs-optional.patch diff --git a/rules/mtd-utils.in b/rules/mtd-utils.in index becdf083d..e6e2252dd 100644 --- a/rules/mtd-utils.in +++ b/rules/mtd-utils.in @@ -21,6 +21,18 @@ config MTD_UTILS_USE_LIBLZO help Enable LZO support +config MTD_UTILS_DOC_LOADBIOS + bool + prompt "doc_loadbios" + help + Tool for DoC. + +config MTD_UTILS_DOCFDISK + bool + prompt "docfdisk" + help + Modify INFTL partition tables. + config MTD_UTILS_FLASH_ERASE bool prompt "flash_erase" @@ -45,6 +57,18 @@ config MTD_UTILS_FLASH_LOCK help This utility locks one or more sectors of flash device. +config MTD_UTILS_FLASH_OTP_DUMP + bool + prompt "flash_otp_dump" + help + Display one time programm data. + +config MTD_UTILS_FLASH_OTP_INFO + bool + prompt "flash_otp_info" + help + Print info about one time program data. + config MTD_UTILS_FLASH_UNLOCK bool prompt "flash_unlock" @@ -105,6 +129,12 @@ config MTD_UTILS_NANDDUMP This utility dumps the contents of raw NAND chips or NAND chips contained in DoC devices. +config MTD_UTILS_NANDTEST + bool + prompt "nandtest" + help + NAND flash test program. + config MTD_UTILS_NANDWRITE bool prompt "nandwrite" @@ -131,6 +161,30 @@ config MTD_UTILS_MKJFFS2 help Build a JFFS2 image in a file, from a given directory tree. +config MTD_UTILS_RECV_IMAGE + bool + prompt "recv_image" + help + Receive an image via multicast. + +config MTD_UTILS_RFDDUMP + bool + prompt "rfddump" + help + Dumps the contents of a resident flash disk. + +config MTD_UTILS_RFDFORMAT + bool + prompt "rfdformat" + help + Formats NOR flash for resident flash disk. + +config MTD_UTILS_SERVE_IMAGE + bool + prompt "serve_image" + help + Distribute flash image to network. + config MTD_UTILS_SUMTOOL bool prompt "sumtool" @@ -139,7 +193,7 @@ config MTD_UTILS_SUMTOOL information for a jffs2 image. This way we can do faster filesystem mount. To use this the JFFS2_SUMMARY option must be enabled in kernel. - + menuconfig MTD_UTILS_UBI_UTILS bool prompt "ubi utils" @@ -179,6 +233,18 @@ config MTD_UTILS_UBIMKVOL help Creates a volume on a UBI device +config MTD_UTILS_UBIRENAME + bool + prompt "ubirename" + help + Rename a volume on a UBI device + +config MTD_UTILS_UBIRSVOL + bool + prompt "ubirsvol" + help + Resize UBI volumes. + config MTD_UTILS_UBINFO bool prompt "ubinfo" diff --git a/rules/mtd-utils.make b/rules/mtd-utils.make index 8bb27f317..b52a170da 100644 --- a/rules/mtd-utils.make +++ b/rules/mtd-utils.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_MTD_UTILS) += mtd-utils # # Paths and names # -MTD_UTILS_VERSION := 1.3.1 -MTD_UTILS_MD5 := c6dd37cc732fb8f7b95c5b82e172ea90 +MTD_UTILS_VERSION := 1.4.6 +MTD_UTILS_MD5 := a0418afcf6026824a5fa5e9051793f3c MTD_UTILS := mtd-utils-$(MTD_UTILS_VERSION) MTD_UTILS_SUFFIX := tar.bz2 MTD_UTILS_URL := ftp://ftp.infradead.org/pub/mtd-utils/$(MTD_UTILS).$(MTD_UTILS_SUFFIX) @@ -72,6 +72,14 @@ $(STATEDIR)/mtd-utils.targetinstall: @$(call install_fixup, mtd-utils,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>") @$(call install_fixup, mtd-utils,DESCRIPTION,missing) +ifdef PTXCONF_MTD_UTILS_DOC_LOADBIOS + @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ + /usr/sbin/doc_loadbios) +endif +ifdef PTXCONF_MTD_UTILS_DOCFDISK + @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ + /usr/sbin/docfdisk) +endif ifdef PTXCONF_MTD_UTILS_FLASH_ERASE @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ /usr/sbin/flash_erase) @@ -88,6 +96,14 @@ ifdef PTXCONF_MTD_UTILS_FLASH_LOCK @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ /usr/sbin/flash_lock) endif +ifdef PTXCONF_MTD_UTILS_FLASH_OTP_DUMP + @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ + /usr/sbin/flash_otp_dump) +endif +ifdef PTXCONF_MTD_UTILS_FLASH_OTP_INFO + @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ + /usr/sbin/flash_otp_info) +endif ifdef PTXCONF_MTD_UTILS_FLASH_UNLOCK @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ /usr/sbin/flash_unlock) @@ -108,7 +124,6 @@ ifdef PTXCONF_MTD_UTILS_JFFS2_DUMP @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ /usr/sbin/jffs2dump) endif - ifdef PTXCONF_MTD_UTILS_MTDDEBUG @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ /usr/sbin/mtd_debug) @@ -117,6 +132,10 @@ ifdef PTXCONF_MTD_UTILS_NANDDUMP @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ /usr/sbin/nanddump) endif +ifdef PTXCONF_MTD_UTILS_NANDTEST + @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ + /usr/sbin/nandtest) +endif ifdef PTXCONF_MTD_UTILS_NANDWRITE @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ /usr/sbin/nandwrite) @@ -133,11 +152,26 @@ ifdef PTXCONF_MTD_UTILS_MKJFFS2 @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ /usr/sbin/mkfs.jffs2) endif +ifdef PTXCONF_MTD_UTILS_RECV_IMAGE + @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ + /usr/sbin/recv_image) +endif +ifdef PTXCONF_MTD_UTILS_RFDDUMP + @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ + /usr/sbin/rfddump) +endif +ifdef PTXCONF_MTD_UTILS_RFDFORMAT + @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ + /usr/sbin/rfdformat) +endif +ifdef PTXCONF_MTD_UTILS_SERVE_IMAGE + @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ + /usr/sbin/serve_image) +endif ifdef PTXCONF_MTD_UTILS_SUMTOOL @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ /usr/sbin/sumtool) endif - ifdef PTXCONF_MTD_UTILS_UBIATTACH @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ /usr/sbin/ubiattach) @@ -154,6 +188,14 @@ ifdef PTXCONF_MTD_UTILS_UBIMKVOL @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ /usr/sbin/ubimkvol) endif +ifdef PTXCONF_MTD_UTILS_UBIRENAME + @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ + /usr/sbin/ubirename) +endif +ifdef PTXCONF_MTD_UTILS_UBIRSVOL + @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ + /usr/sbin/ubirsvol) +endif ifdef PTXCONF_MTD_UTILS_UBIRMVOL @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ /usr/sbin/ubirmvol) |