From: Carsten Schlote <c.schl...@konzeptpark.de>

This patch adds config options for the remaining
MTD utils.

As we need to build images, we also select the
host mtd utils

Signed-off-by: Carsten Schlote <c.schl...@konzeptpark.de>
---
 rules/mtd-utils.in   |  200 +++++++++++++++++++++++++++++++++++++++++--------
 rules/mtd-utils.make |  123 ++++++++++++++++++++++---------
 2 files changed, 255 insertions(+), 68 deletions(-)

diff --git a/rules/mtd-utils.in b/rules/mtd-utils.in
index 5f91944..e8bc636 100644
--- a/rules/mtd-utils.in
+++ b/rules/mtd-utils.in
@@ -6,6 +6,7 @@ menuconfig MTD_UTILS
        select ZLIB
        select E2FSPROGS
        select LIBLZO if MTD_UTILS_USE_LIBLZO
+       select HOST_MTD_UTILS
        help
          Memory Technology Device Utilities
 
@@ -14,12 +15,74 @@ menuconfig MTD_UTILS
 
 if MTD_UTILS
 
+comment "build options"
+
 config MTD_UTILS_USE_LIBLZO
        bool
        prompt "liblzo support"
        help
          Enable LZO support
 
+
+comment "misc utils"
+
+config MTD_UTILS_PDDCUSTOMIZE
+       bool
+       prompt "pddcustomize"
+       help
+         customize bootenv and pdd values
+
+config MTD_UTILS_MKPFI
+       bool
+       prompt "mkpfi"
+       help
+         This perl program is assembles PFI files from a config file
+
+config MTD_UTILS_PFI2BIN
+       bool
+       prompt "pfi2bin"
+       help
+         a tool to convert PFI files into binary images
+
+config MTD_UTILS_PFIFLASH
+       bool
+       prompt "pfiflash"
+       help
+         a tool for updating a controller with PFI files
+
+config MTD_UTILS_DOC_LOADBIOS
+       bool
+       prompt "doc_loadbios"
+       help
+         FIXME
+
+config MTD_UTILS_DOCFDISK
+       bool
+       prompt "docfdisk"
+       help
+         FIXME
+
+config MTD_UTILS_MTD_DEBUG
+       bool
+       prompt "mtd_debug"
+       help
+         Does info, read, write and erase on mtd devices
+
+config MTD_UTILS_RECV_IMAGE
+       bool
+       prompt "recv_image"
+       help
+         Receive and flash image from a network host
+
+config MTD_UTILS_SERVE_IMAGE
+       bool
+       prompt "serve_image"
+       help
+         Serve flashimage to network
+
+
+comment "flash utils"
+
 config MTD_UTILS_FLASH_ERASE
        bool
        prompt "flash_erase"
@@ -44,6 +107,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
+         FIXME
+
+config MTD_UTILS_FLASH_OTP_INFO
+       bool
+       prompt "flash_otp_info"
+       help
+         FIXME
+
 config MTD_UTILS_FLASH_UNLOCK
        bool
        prompt "flash_unlock"
@@ -56,53 +131,81 @@ config MTD_UTILS_FLASHCP
        help
          Flash Copy - Written by Abraham van der Merwe
 
-config MTD_UTILS_FTL_CHECK
+config MTD_UTILS_JFFS2DUMP
        bool
-       prompt "ftl_check"
+       prompt "jffs2dump"
        help
-         Utility to check an FTL partition
+         This utility dumps the contents of a binary JFFS2 image
 
-config MTD_UTILS_FTL_FORMAT
+config MTD_UTILS_MKFS_JFFS2
        bool
-       prompt "ftl_format"
+       prompt "mkfs.jffs2"
        help
-         Utility to create an FTL partition in a memory region
+         Build a JFFS2 image in a file, from a given directory tree.
 
-config MTD_UTILS_JFFS2_DUMP
+config MTD_UTILS_RFDDUMP
        bool
-       prompt "jffs2_dump"
+       prompt "rfddump"
        help
-         This utility dumps the contents of a binary JFFS2 image
+         Dumps the contents of a resident flash disk
 
-#config MTD_UTILS_JFFS2READER
-#      bool
-#      prompt "jffs2reader"
-#      help
-#        A jffs2 image reader
+config MTD_UTILS_RFDFORMAT
+       bool
+       prompt "rfdformat"
+       help
+         Formats NOR flash for resident flash disk
 
-config MTD_UTILS_JITTERTEST
+config MTD_UTILS_SUMTOOL
        bool
-       prompt "jittertest"
+       prompt "sumtool"
        help
-         This program is used to measure what the jitter of a
-         real time task would be under "standard" Linux.
+         Convert the input JFFS2 image to a summarized JFFS2 image
+         Summary makes mounting faster - if summary support enabled in your 
kernel
+
 
-         More particularly, what is the effect of running
-         a real time task under Linux with background
-         JFFS file system activity.
+comment "nand utils"
 
-config MTD_UTILS_MTDDEBUG
+config MTD_UTILS_BIN2NAND
        bool
-       prompt "mtd_debug"
+       prompt "bin2nand"
        help
-         Does info, read, write and erase on mtd devices
+         a tool for adding OOB information to a binary input file
+
+config MTD_UTILS_MKBOOTENV
+       bool
+       prompt "mkbootenv"
+       help
+         processes bootenv text files and convertes them into a binary format
+
+config MTD_UTILS_NAND2BIN
+       bool
+       prompt "nand2bin"
+       help
+         split data and OOB
+
+config MTD_UTILS_FTL_CHECK
+       bool
+       prompt "ftl_check"
+       help
+         Utility to check an FTL partition
+
+config MTD_UTILS_FTL_FORMAT
+       bool
+       prompt "ftl_format"
+       help
+         Utility to create an FTL partition in a memory region
 
 config MTD_UTILS_NANDDUMP
        bool
        prompt "nanddump"
        help
-         This utility dumps the contents of raw NAND chips or NAND
-         chips contained in DoC devices.
+         Dumping the content of NFTL partitions on a "Physical Disk"
+
+config MTD_UTILS_NANDTEST
+       bool
+       prompt "nandtest"
+       help
+         test NAND device and badblock check
 
 config MTD_UTILS_NANDWRITE
        bool
@@ -122,13 +225,10 @@ config MTD_UTILS_NFTLDUMP
        bool
        prompt "nftldump"
        help
-         Dumping the content of NFTL partitions on a "Physical Disk"
+         This utility dumps the contents of raw NAND chips or NAND
+         chips contained in DoC devices.
+
 
-config MTD_UTILS_MKJFFS2
-       bool
-       prompt "mkfs.jffs2"
-       help
-         Build a JFFS2 image in a file, from a given directory tree.
 
 config MTD_UTILS_SUMTOOL
        bool
@@ -153,6 +253,12 @@ config MTD_UTILS_UBICRC32
        help
          UBI CRC2 file checksum
 
+config MTD_UTILS_UBICRC32_PL
+       bool
+       prompt "ubicrc32.pl"
+       help
+         Perl wrapper
+
 config MTD_UTILS_UBIDETACH
        bool
        prompt "ubidetach"
@@ -165,6 +271,18 @@ config MTD_UTILS_UBIFORMAT
        help
          format an mtd device
 
+config MTD_UTILS_UBIGEN
+       bool
+       prompt "ubigen"
+       help
+         a tool for adding UBI information to a binary input file
+
+config MTD_UTILS_UBIMIRROR
+       bool
+       prompt "ubimirror"
+       help
+         mirrors ubi volumes
+
 config MTD_UTILS_UBIMKVOL
        bool
        prompt "ubimkvol"
@@ -181,7 +299,15 @@ config MTD_UTILS_UBINIZE
        bool
        prompt "ubinize"
        help
-         Creates UBI images. Probably more useful on host than on target
+         ubinize version 1.0 - a tool to generate UBI images. An UBI image may 
contain
+         one or more UBI volumes which have to be defined in the input 
configuration
+         ini-file. The ini file defines all the UBI volumes - their 
characteristics and
+         the and the contents, but it does not define the characteristics of 
the flash
+         the UBI image is generated for. Instead, the flash characteristics 
are defined
+         via the command-line options. Note, if not sure about some of the 
command-line
+         parameters, do not specify them and let the utility to use default 
values.
+         Creates UBI images.
+         Probably more useful on host than on target.
 
 config MTD_UTILS_UBIRMVOL
        bool
@@ -195,6 +321,14 @@ config MTD_UTILS_UBIUPDATEVOL
        help
          Updates a volume with data from file
 
+config MTD_UTILS_UNUBI
+       bool
+       prompt "unubi"
+       help
+         Extract volumes and/or analysis information from an UBI data file.
+         When no parameters are flagged or given, the default operation is
+         to rebuild all valid complete UBI volumes found within the image.
+
 config MTD_UTILS_MTDINFO
        bool
        prompt "mtdinfo"
diff --git a/rules/mtd-utils.make b/rules/mtd-utils.make
index 113270d..f00f572 100644
--- a/rules/mtd-utils.make
+++ b/rules/mtd-utils.make
@@ -66,70 +66,106 @@ $(STATEDIR)/mtd-utils.targetinstall:
        @$(call install_fixup, mtd-utils,PRIORITY,optional)
        @$(call install_fixup, mtd-utils,VERSION,$(MTD_UTILS_VERSION))
        @$(call install_fixup, mtd-utils,SECTION,base)
-       @$(call install_fixup, mtd-utils,AUTHOR,"Robert Schwebel 
<r.schwe...@pengutronix.de>")
+       @$(call install_fixup, mtd-utils,AUTHOR,"Carsten Schlote 
<c.schlo...@konzeptpark.de>")
        @$(call install_fixup, mtd-utils,DEPENDS,)
        @$(call install_fixup, mtd-utils,DESCRIPTION,missing)
 
+ifdef PTXCONF_MTD_UTILS_BIN2NAND
+       @$(call install_copy, mtd-utils, 0, 0, 0755, -, /usr/sbin/bin2nand)
+endif
+ifdef PTXCONF_MTD_UTILS_MKBOOTENV
+       @$(call install_copy, mtd-utils, 0, 0, 0755, -, /usr/sbin/mkbootenv)
+endif
+ifdef PTXCONF_MTD_UTILS_MKPFI
+       @$(call install_copy, mtd-utils, 0, 0, 0755, -, /usr/sbin/mkpfi)
+endif
+ifdef PTXCONF_MTD_UTILS_NAND2BIN
+       @$(call install_copy, mtd-utils, 0, 0, 0755, -, /usr/sbin/nand2bin)
+endif
+ifdef PTXCONF_MTD_UTILS_PDDCUSTOMIZE
+       @$(call install_copy, mtd-utils, 0, 0, 0755, -, /usr/sbin/pddcustomize)
+endif
+ifdef PTXCONF_MTD_UTILS_PFI2BIN
+       @$(call install_copy, mtd-utils, 0, 0, 0755, -, /usr/sbin/pfi2bin)
+endif
+ifdef PTXCONF_MTD_UTILS_PFIFLASH
+       @$(call install_copy, mtd-utils, 0, 0, 0755, -, /usr/sbin/pfiflash)
+endif
+
+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)
+       @$(call install_copy, mtd-utils, 0, 0, 0755, -, /usr/sbin/flash_erase)
 endif
 ifdef PTXCONF_MTD_UTILS_FLASH_ERASEALL
-       @$(call install_copy, mtd-utils, 0, 0, 0755, -, \
-               /usr/sbin/flash_eraseall)
+       @$(call install_copy, mtd-utils, 0, 0, 0755, -, 
/usr/sbin/flash_eraseall)
 endif
 ifdef PTXCONF_MTD_UTILS_FLASH_INFO
-       @$(call install_copy, mtd-utils, 0, 0, 0755, -, \
-               /usr/sbin/flash_info)
+       @$(call install_copy, mtd-utils, 0, 0, 0755, -, /usr/sbin/flash_info)
 endif
 ifdef PTXCONF_MTD_UTILS_FLASH_LOCK
-       @$(call install_copy, mtd-utils, 0, 0, 0755, -, \
-               /usr/sbin/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)
+       @$(call install_copy, mtd-utils, 0, 0, 0755, -, /usr/sbin/flash_unlock)
 endif
 ifdef PTXCONF_MTD_UTILS_FLASHCP
-       @$(call install_copy, mtd-utils, 0, 0, 0755, -, \
-               /usr/sbin/flashcp)
+       @$(call install_copy, mtd-utils, 0, 0, 0755, -, /usr/sbin/flashcp)
 endif
 ifdef PTXCONF_MTD_UTILS_FTL_CHECK
-       @$(call install_copy, mtd-utils, 0, 0, 0755, -, \
-               /usr/sbin/ftl_check)
+       @$(call install_copy, mtd-utils, 0, 0, 0755, -, /usr/sbin/ftl_check)
 endif
 ifdef PTXCONF_MTD_UTILS_FTL_FORMAT
-       @$(call install_copy, mtd-utils, 0, 0, 0755, -, \
-               /usr/sbin/ftl_format)
+       @$(call install_copy, mtd-utils, 0, 0, 0755, -, /usr/sbin/ftl_format)
 endif
-ifdef PTXCONF_MTD_UTILS_JFFS2_DUMP
-       @$(call install_copy, mtd-utils, 0, 0, 0755, -, \
-               /usr/sbin/jffs2dump)
+ifdef PTXCONF_MTD_UTILS_JFFS2DUMP
+       @$(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)
+ifdef PTXCONF_MTD_UTILS_MKFS.JFFS2
+       @$(call install_copy, mtd-utils, 0, 0, 0755, -, /usr/sbin/mkfs.jffs2)
+endif
+ifdef PTXCONF_MTD_UTILS_MTD_DEBUG
+       @$(call install_copy, mtd-utils, 0, 0, 0755, -, /usr/sbin/mtd_debug)
 endif
 ifdef PTXCONF_MTD_UTILS_NANDDUMP
-       @$(call install_copy, mtd-utils, 0, 0, 0755, -, \
-               /usr/sbin/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)
+       @$(call install_copy, mtd-utils, 0, 0, 0755, -, /usr/sbin/nandwrite)
 endif
 ifdef PTXCONF_MTD_UTILS_NFTL_FORMAT
-       @$(call install_copy, mtd-utils, 0, 0, 0755, -, \
-               /usr/sbin/nftl_format)
+       @$(call install_copy, mtd-utils, 0, 0, 0755, -, /usr/sbin/nftl_format)
 endif
 ifdef PTXCONF_MTD_UTILS_NFTLDUMP
-       @$(call install_copy, mtd-utils, 0, 0, 0755, -, \
-               /usr/sbin/nftldump)
+       @$(call install_copy, mtd-utils, 0, 0, 0755, -, /usr/sbin/nftldump)
 endif
-ifdef PTXCONF_MTD_UTILS_MKJFFS2
-       @$(call install_copy, mtd-utils, 0, 0, 0755, -, \
-               /usr/sbin/mkfs.jffs2)
+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_SUMTOOL
        @$(call install_copy, mtd-utils, 0, 0, 0755, -, \
@@ -172,6 +208,23 @@ ifdef PTXCONF_MTD_UTILS_UBINIZE
        @$(call install_copy, mtd-utils, 0, 0, 0755, -, \
                /usr/sbin/ubinize)
 endif
+ifdef PTXCONF_MTD_UTILS_UBICRC32_PL
+       @$(call install_copy, mtd-utils, 0, 0, 0755, -, \
+               /usr/sbin/ubicrc32.pl)
+endif
+ifdef PTXCONF_MTD_UTILS_UBIGEN
+       @$(call install_copy, mtd-utils, 0, 0, 0755, -, \
+               /usr/sbin/ubigen)
+endif
+ifdef PTXCONF_MTD_UTILS_UBIMIRROR
+       @$(call install_copy, mtd-utils, 0, 0, 0755, -, \
+               /usr/sbin/ubimirror)
+endif
+ifdef PTXCONF_MTD_UTILS_UNUBI
+       @$(call install_copy, mtd-utils, 0, 0, 0755, -, \
+               /usr/sbin/unubi)
+endif
+
 ifdef PTXCONF_MTD_UTILS_MTDINFO
        @$(call install_copy, mtd-utils, 0, 0, 0755, -, \
                /usr/sbin/mtdinfo)
-- 
1.6.5.6.gb3118


--
ptxdist mailing list
ptxdist@pengutronix.de

Reply via email to