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

Added options to install remaining mtd-utils
on target.

Restructured .in file and menus.

Signed-off-by: Carsten Schlote <c.schl...@konzeptpark.de>
---
 rules/mtd-utils.in   |  300 +++++++++++++++++++++++++++++++++++++++-----------
 rules/mtd-utils.make |  126 +++++++++++++++------
 2 files changed, 328 insertions(+), 98 deletions(-)

diff --git a/rules/mtd-utils.in b/rules/mtd-utils.in
index 7caad2e..6aaf9fc 100644
--- a/rules/mtd-utils.in
+++ b/rules/mtd-utils.in
@@ -20,6 +20,15 @@ config MTD_UTILS_USE_LIBLZO
        help
          Enable LZO support
 
+
+menuconfig MTD_UTILS_FLASH_UTILS
+       bool
+       prompt "flash utils"
+       help
+         Tools to manipulate flash MTD devices
+
+if MTD_UTILS_FLASH_UTILS
+
 config MTD_UTILS_FLASH_ERASE
        bool
        prompt "flash_erase"
@@ -56,17 +65,32 @@ config MTD_UTILS_FLASHCP
        help
          Flash Copy - Written by Abraham van der Merwe
 
-config MTD_UTILS_FTL_CHECK
+endif
+
+
+
+menuconfig MTD_UTILS_JFFS2_UTILS
        bool
-       prompt "ftl_check"
+       prompt "nand utils"
        help
-         Utility to check an FTL partition
+         Tools to manipulate flash MTD devices
 
-config MTD_UTILS_FTL_FORMAT
+if MTD_UTILS_JFFS2_UTILS
+
+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_SUMTOOL
+       bool
+       prompt "sumtool"
+       help
+         Sumtool can be used to generate EBS(Erase Block Summary)
+         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.
 
 config MTD_UTILS_JFFS2_DUMP
        bool
@@ -80,65 +104,11 @@ config MTD_UTILS_JFFS2_DUMP
 #      help
 #        A jffs2 image reader
 
-config MTD_UTILS_JITTERTEST
-       bool
-       prompt "jittertest"
-       help
-         This program is used to measure what the jitter of a
-         real time task would be under "standard" Linux.
-
-         More particularly, what is the effect of running
-         a real time task under Linux with background
-         JFFS file system activity.
-
-config MTD_UTILS_MTDDEBUG
-       bool
-       prompt "mtd_debug"
-       help
-         Does info, read, write and erase on mtd devices
-
-config MTD_UTILS_NANDDUMP
-       bool
-       prompt "nanddump"
-       help
-         This utility dumps the contents of raw NAND chips or NAND
-         chips contained in DoC devices.
-
-config MTD_UTILS_NANDWRITE
-       bool
-       prompt "nandwrite"
-       help
-         This utility writes a binary image directly to a NAND flash
-         chip or NAND chips contained in DoC devices. This is the
-         "inverse operation" of nanddump.
+endif
 
-config MTD_UTILS_NFTL_FORMAT
-       bool
-       prompt "nftl_format"
-       help
-         Creating a NFTL/INFTL partition on an MTD device
 
-config MTD_UTILS_NFTLDUMP
-       bool
-       prompt "nftldump"
-       help
-         Dumping the content of NFTL partitions on a "Physical Disk"
 
-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
-       prompt "sumtool"
-       help
-         Sumtool can be used to generate EBS(Erase Block Summary)
-         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"
@@ -159,6 +129,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"
@@ -171,6 +147,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"
@@ -201,14 +189,20 @@ 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_MKFS_UBIFS
        bool
        prompt "mkfs.ubifs"
        help
          Create ubifs filesystems
 
-endif
-
 config MTD_UTILS_MTDINFO
        bool
        prompt "mtdinfo"
@@ -216,3 +210,183 @@ config MTD_UTILS_MTDINFO
          Print UBI specific information about mtd devices
 
 endif
+
+
+
+
+
+menuconfig MTD_UTILS_PFI_UTILS
+       bool
+       prompt "pfi utils"
+       help
+         Build PFI 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_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
+
+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_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
+
+endif
+
+
+
+
+
+
+
+menuconfig MTD_UTILS_NAND_UTILS
+       bool
+       prompt "nand utils"
+       help
+         Build NAND Utils
+
+if MTD_UTILS_NAND_UTILS
+
+config MTD_UTILS_BIN2NAND
+       bool
+       prompt "bin2nand"
+       help
+         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_NANDDUMP
+       bool
+       prompt "nanddump"
+       help
+         This utility dumps the contents of raw NAND chips or NAND
+         chips contained in DoC devices.
+
+config MTD_UTILS_NANDTEST
+       bool
+       prompt "nandtest"
+       help
+         test NAND device and badblock check
+
+config MTD_UTILS_NANDWRITE
+       bool
+       prompt "nandwrite"
+       help
+         This utility writes a binary image directly to a NAND flash
+         chip or NAND chips contained in DoC devices. This is the
+         "inverse operation" of nanddump.
+
+config MTD_UTILS_NFTL_FORMAT
+       bool
+       prompt "nftl_format"
+       help
+         Creating a NFTL/INFTL partition on an MTD device
+
+config MTD_UTILS_NFTLDUMP
+       bool
+       prompt "nftldump"
+       help
+         Dumping the content of NFTL partitions on a "Physical Disk"
+
+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
+
+endif
+
+config MTD_UTILS_JITTERTEST
+       bool
+       prompt "jittertest"
+       help
+         This program is used to measure what the jitter of a
+         real time task would be under "standard" Linux.
+
+         More particularly, what is the effect of running
+         a real time task under Linux with background
+         JFFS file system activity.
+
+config MTD_UTILS_MTD_DEBUG
+       bool
+       prompt "mtd_debug"
+       help
+         Does info, read, write and erase on mtd devices
diff --git a/rules/mtd-utils.make b/rules/mtd-utils.make
index 9636143..f832dff 100644
--- a/rules/mtd-utils.make
+++ b/rules/mtd-utils.make
@@ -70,70 +70,102 @@ $(STATEDIR)/mtd-utils.targetinstall:
        @$(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)
+       @$(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)
+       @$(call install_copy, mtd-utils, 0, 0, 0755, -, /usr/sbin/sumtool)
 endif
 
 ifdef PTXCONF_MTD_UTILS_UBIATTACH
@@ -172,15 +204,39 @@ 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_MKFS_UBIFS
        @$(call install_copy, mtd-utils, 0, 0, 0755, -, \
                /usr/sbin/mkfs.ubifs);
 endif
+
 ifdef PTXCONF_MTD_UTILS_MTDINFO
        @$(call install_copy, mtd-utils, 0, 0, 0755, -, \
                /usr/sbin/mtdinfo)
 endif
 
+ifdef PTXCONF_MTD_UTILS_JITTERTEST
+       @$(call install_copy, mtd-utils, 0, 0, 0755, -, \
+               /usr/sbin/jittertest)
+endif
+
        @$(call install_finish, mtd-utils)
 
        @$(call touch)
-- 
1.6.5.6.gb3118


--
ptxdist mailing list
ptxdist@pengutronix.de

Reply via email to