mtd-utils: Restructure the mtd-utils source.

* There is no code modification in this commit, only moving
* the files to proper place.

The user tools looks a little messy as we place almost
the all tools in the root directory of mtd-utils. To make
it more clear, I propose to introduce the following structure
for our source code.

mtd-utils/
	|-- lib
	|-- include
	|-- misc-utils
	|-- jffsX-utils
	|-- nand-utils
	|-- nor-utils
	|-- ubi-utils
	|-- ubifs-utils
	`-- tests

Signed-off-by: Dongsheng Yang <yangds.fnst@cn.fujitsu.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

65 files changed, 63 insertions, 55 deletions

diff --git a/.gitignore b/.gitignore
index effb686..2aac52c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,34 +18,33 @@
 #
 # Our programs
 #
-/doc_loadbios
-/docfdisk
-/flash_erase
-/flash_info
-/flash_lock
-/flash_otp_dump
-/flash_otp_info
-/flash_otp_lock
-/flash_otp_write
-/flash_unlock
-/flashcp
-/ftl_check
-/ftl_format
-/jffs2dump
-/jffs2reader
-/mkfs.jffs2
-/mtd_debug
-/mtdpart
-/nanddump
-/nandtest
-/nandwrite
-/nftl_format
-/nftldump
-/recv_image
-/rfddump
-/rfdformat
-/serve_image
-/sumtool
+/misc-utils/doc_loadbios
+/misc-utils/docfdisk
+/misc-utils/flash_erase
+/misc-utils/flash_lock
+/misc-utils/flash_otp_dump
+/misc-utils/flash_otp_info
+/misc-utils/flash_otp_lock
+/misc-utils/flash_otp_write
+/misc-utils/flash_unlock
+/misc-utils/flashcp
+/misc-utils/ftl_check
+/misc-utils/ftl_format
+/jffsX-utils/jffs2dump
+/jffsX-utils/jffs2reader
+/jffsX-utils/mkfs.jffs2
+/misc-utils/mtd_debug
+/misc-utils/mtdpart
+/nand-utils/nanddump
+/nand-utils/nandtest
+/nand-utils/nandwrite
+/nand-utils/nftl_format
+/nand-utils/nftldump
+/misc-utils/recv_image
+/nor-utils/rfddump
+/nor-utils/rfdformat
+/misc-utils/serve_image
+/jffsX-utils/sumtool
 
 #
 # Top-level generic files
diff --git a/Makefile b/Makefile
index 3ce8587..ed9d83b 100644
--- a/Makefile
+++ b/Makefile
@@ -16,24 +16,30 @@ endif
 
 TESTS = tests
 
-MTD_BINS = \
-	ftl_format flash_erase nanddump doc_loadbios \
-	ftl_check mkfs.jffs2 flash_lock flash_unlock \
-	flash_otp_info flash_otp_dump flash_otp_lock flash_otp_write \
-	mtd_debug flashcp nandwrite nandtest mtdpart \
-	jffs2dump \
-	nftldump nftl_format docfdisk \
-	rfddump rfdformat \
-	serve_image recv_image \
-	sumtool jffs2reader
+MISC_BINS = \
+	ftl_format doc_loadbios ftl_check mtd_debug docfdisk \
+	serve_image recv_image mtdpart flash_erase flash_lock \
+	flash_unlock flash_otp_info flash_otp_dump flash_otp_lock \
+	flash_otp_write flashcp
 UBI_BINS = \
 	ubiupdatevol ubimkvol ubirmvol ubicrc32 ubinfo ubiattach \
 	ubidetach ubinize ubiformat ubirename mtdinfo ubirsvol ubiblock
-
-BINS = $(MTD_BINS)
-BINS += mkfs.ubifs/mkfs.ubifs
+UBIFS_BINS = \
+	mkfs.ubifs/mkfs.ubifs
+JFFSX_BINS = \
+	mkfs.jffs2 sumtool jffs2reader jffs2dump
+NAND_BINS = \
+	nanddump nandwrite nandtest nftldump nftl_format
+NOR_BINS = \
+	rfddump rfdformat
+
+BINS = $(addprefix misc-utils/,$(MISC_BINS))
 BINS += $(addprefix ubi-utils/,$(UBI_BINS))
-SCRIPTS = flash_eraseall
+BINS += $(addprefix ubifs-utils/,$(UBIFS_BINS))
+BINS += $(addprefix jffsX-utils/,$(JFFSX_BINS))
+BINS += $(addprefix nand-utils/,$(NAND_BINS))
+BINS += $(addprefix nor-utils/,$(NOR_BINS))
+SCRIPTS = $(addprefix misc-utils/,flash_eraseall)
 
 TARGETS = $(BINS)
 TARGETS += lib/libmtd.a
@@ -61,11 +67,11 @@ endif
 	rm -f $(BUILDDIR)/include/version.h
 	$(MAKE) -C $(TESTS) clean
 
-install:: $(addprefix $(BUILDDIR)/,${BINS}) ${SCRIPTS}
+install:: $(addprefix $(BUILDDIR)/,${BINS} ${SCRIPTS})
 	mkdir -p ${DESTDIR}/${SBINDIR}
 	install -m 0755 $^ ${DESTDIR}/${SBINDIR}/
 	mkdir -p ${DESTDIR}/${MANDIR}/man1
-	install -m 0644 mkfs.jffs2.1 ${DESTDIR}/${MANDIR}/man1/
+	install -m 0644 jffsX-utils/mkfs.jffs2.1 ${DESTDIR}/${MANDIR}/man1/
 	-gzip -9f ${DESTDIR}/${MANDIR}/man1/*.1
 
 tests::
@@ -85,13 +91,16 @@ $(BUILDDIR)/include/version.h.tmp:
 # Utils in top level
 #
 obj-mkfs.jffs2 = compr_rtime.o compr_zlib.o compr_lzo.o compr.o rbtree.o
-LDFLAGS_mkfs.jffs2 = $(ZLIBLDFLAGS) $(LZOLDFLAGS)
+LDFLAGS_mkfs.jffs2 = $(ZLIBLDFLAGS) $(LZOLDFLAGS) $(CPPFLAGS)
 LDLIBS_mkfs.jffs2  = -lz $(LZOLDLIBS)
 
 LDFLAGS_jffs2reader = $(ZLIBLDFLAGS) $(LZOLDFLAGS)
 LDLIBS_jffs2reader  = -lz $(LZOLDLIBS)
 
-$(foreach v,$(MTD_BINS),$(eval $(call mkdep,,$(v))))
+$(foreach v,$(MISC_BINS),$(eval $(call mkdep,misc-utils/,$(v))))
+$(foreach v,$(JFFSX_BINS),$(eval $(call mkdep,jffsX-utils/,$(v))))
+$(foreach v,$(NAND_BINS),$(eval $(call mkdep,nand-utils/,$(v))))
+$(foreach v,$(NOR_BINS),$(eval $(call mkdep,nor-utils/,$(v))))
 
 #
 # Common libmtd
@@ -100,15 +109,6 @@ obj-libmtd.a = libmtd.o libmtd_legacy.o libcrc32.o libfec.o
 $(call _mkdep,lib/,libmtd.a)
 
 #
-# Utils in mkfs.ubifs subdir
-#
-obj-mkfs.ubifs = crc16.o lpt.o compr.o devtable.o \
-	hashtable/hashtable.o hashtable/hashtable_itr.o
-LDFLAGS_mkfs.ubifs = $(ZLIBLDFLAGS) $(LZOLDFLAGS) $(UUIDLDFLAGS)
-LDLIBS_mkfs.ubifs = -lz -llzo2 -lm -luuid
-$(call mkdep,mkfs.ubifs/,mkfs.ubifs,,ubi-utils/libubi.a)
-
-#
 # Utils in ubi-utils/ subdir
 #
 obj-libiniparser.a = libiniparser.o dictionary.o
@@ -122,3 +122,12 @@ obj-ubiformat = libubigen.a libscan.a
 
 $(foreach v,libubi.a libubigen.a libiniparser.a libscan.a,$(eval $(call _mkdep,ubi-utils/,$(v))))
 $(foreach v,$(UBI_BINS),$(eval $(call mkdep,ubi-utils/,$(v),libubi.a ubiutils-common.o)))
+
+#
+# Utils in ubifs-utils subdir
+#
+obj-mkfs.ubifs = crc16.o lpt.o compr.o devtable.o \
+	hashtable/hashtable.o hashtable/hashtable_itr.o
+LDFLAGS_mkfs.ubifs = $(ZLIBLDFLAGS) $(LZOLDFLAGS) $(UUIDLDFLAGS)
+LDLIBS_mkfs.ubifs = -lz -llzo2 -lm -luuid
+$(call mkdep,ubifs-utils/mkfs.ubifs/,mkfs.ubifs,,ubi-utils/libubi.a)
diff --git a/compr.c b/jffsX-utils/compr.c
index cb4432e..cb4432e 100644
--- a/compr.c
+++ b/jffsX-utils/compr.c
diff --git a/compr.h b/jffsX-utils/compr.h
index a21e935..a21e935 100644
--- a/compr.h
+++ b/jffsX-utils/compr.h
diff --git a/compr_lzo.c b/jffsX-utils/compr_lzo.c
index d2e2afc..d2e2afc 100644
--- a/compr_lzo.c
+++ b/jffsX-utils/compr_lzo.c
diff --git a/compr_rtime.c b/jffsX-utils/compr_rtime.c
index f24379d..f24379d 100644
--- a/compr_rtime.c
+++ b/jffsX-utils/compr_rtime.c
diff --git a/compr_zlib.c b/jffsX-utils/compr_zlib.c
index 1f94628..1f94628 100644
--- a/compr_zlib.c
+++ b/jffsX-utils/compr_zlib.c
diff --git a/device_table.txt b/jffsX-utils/device_table.txt
index 394a62b..394a62b 100644
--- a/device_table.txt
+++ b/jffsX-utils/device_table.txt
diff --git a/jffs-dump.c b/jffsX-utils/jffs-dump.c
index 3176469..3176469 100644
--- a/jffs-dump.c
+++ b/jffsX-utils/jffs-dump.c
diff --git a/jffs2dump.c b/jffsX-utils/jffs2dump.c
index f8b8ac7..f8b8ac7 100644
--- a/jffs2dump.c
+++ b/jffsX-utils/jffs2dump.c
diff --git a/jffs2reader.c b/jffsX-utils/jffs2reader.c
index a62da9a..a62da9a 100644
--- a/jffs2reader.c
+++ b/jffsX-utils/jffs2reader.c
diff --git a/mkfs.jffs2.1 b/jffsX-utils/mkfs.jffs2.1
index 7c57ddc..7c57ddc 100644
--- a/mkfs.jffs2.1
+++ b/jffsX-utils/mkfs.jffs2.1
diff --git a/mkfs.jffs2.c b/jffsX-utils/mkfs.jffs2.c
index f09c0b2..f09c0b2 100644
--- a/mkfs.jffs2.c
+++ b/jffsX-utils/mkfs.jffs2.c
diff --git a/rbtree.c b/jffsX-utils/rbtree.c
index 329e098..329e098 100644
--- a/rbtree.c
+++ b/jffsX-utils/rbtree.c
diff --git a/rbtree.h b/jffsX-utils/rbtree.h
index 0d77b65..0d77b65 100644
--- a/rbtree.h
+++ b/jffsX-utils/rbtree.h
diff --git a/summary.h b/jffsX-utils/summary.h
index e9d95a5..e9d95a5 100644
--- a/summary.h
+++ b/jffsX-utils/summary.h
diff --git a/sumtool.c b/jffsX-utils/sumtool.c
index 886b545..886b545 100644
--- a/sumtool.c
+++ b/jffsX-utils/sumtool.c
diff --git a/MAKEDEV b/misc-utils/MAKEDEV
index b59e90e..b59e90e 100755
--- a/MAKEDEV
+++ b/misc-utils/MAKEDEV
diff --git a/doc_loadbios.c b/misc-utils/doc_loadbios.c
index b999c73..b999c73 100644
--- a/doc_loadbios.c
+++ b/misc-utils/doc_loadbios.c
diff --git a/docfdisk.c b/misc-utils/docfdisk.c
index 9956de5..9956de5 100644
--- a/docfdisk.c
+++ b/misc-utils/docfdisk.c
diff --git a/fectest.c b/misc-utils/fectest.c
index fd577f3..fd577f3 100644
--- a/fectest.c
+++ b/misc-utils/fectest.c
diff --git a/flash_erase.c b/misc-utils/flash_erase.c
index 933373a..933373a 100644
--- a/flash_erase.c
+++ b/misc-utils/flash_erase.c
diff --git a/flash_eraseall b/misc-utils/flash_eraseall
index c5539b3..c5539b3 100755
--- a/flash_eraseall
+++ b/misc-utils/flash_eraseall
diff --git a/flash_lock.c b/misc-utils/flash_lock.c
index 33f76c7..33f76c7 100644
--- a/flash_lock.c
+++ b/misc-utils/flash_lock.c
diff --git a/flash_otp_dump.c b/misc-utils/flash_otp_dump.c
index f0c0fb9..f0c0fb9 100644
--- a/flash_otp_dump.c
+++ b/misc-utils/flash_otp_dump.c
diff --git a/flash_otp_info.c b/misc-utils/flash_otp_info.c
index 2061797..2061797 100644
--- a/flash_otp_info.c
+++ b/misc-utils/flash_otp_info.c
diff --git a/flash_otp_lock.c b/misc-utils/flash_otp_lock.c
index 3c39a2d..3c39a2d 100644
--- a/flash_otp_lock.c
+++ b/misc-utils/flash_otp_lock.c
diff --git a/flash_otp_write.c b/misc-utils/flash_otp_write.c
index 111318d..111318d 100644
--- a/flash_otp_write.c
+++ b/misc-utils/flash_otp_write.c
diff --git a/flash_unlock.c b/misc-utils/flash_unlock.c
index f51870a..f51870a 100644
--- a/flash_unlock.c
+++ b/misc-utils/flash_unlock.c
diff --git a/flashcp.c b/misc-utils/flashcp.c
index 86334ac..86334ac 100644
--- a/flashcp.c
+++ b/misc-utils/flashcp.c
diff --git a/ftl_check.c b/misc-utils/ftl_check.c
index 0eada8f..0eada8f 100644
--- a/ftl_check.c
+++ b/misc-utils/ftl_check.c
diff --git a/ftl_format.c b/misc-utils/ftl_format.c
index b58677f..b58677f 100644
--- a/ftl_format.c
+++ b/misc-utils/ftl_format.c
diff --git a/mcast_image.h b/misc-utils/mcast_image.h
index 8e94ffa..8e94ffa 100644
--- a/mcast_image.h
+++ b/misc-utils/mcast_image.h
diff --git a/mtd_debug.c b/misc-utils/mtd_debug.c
index d6993ce..d6993ce 100644
--- a/mtd_debug.c
+++ b/misc-utils/mtd_debug.c
diff --git a/mtdpart.c b/misc-utils/mtdpart.c
index 0016e34..0016e34 100644
--- a/mtdpart.c
+++ b/misc-utils/mtdpart.c
diff --git a/recv_image.c b/misc-utils/recv_image.c
index 0093831..0093831 100644
--- a/recv_image.c
+++ b/misc-utils/recv_image.c
diff --git a/serve_image.c b/misc-utils/serve_image.c
index cbcf3b7..cbcf3b7 100644
--- a/serve_image.c
+++ b/misc-utils/serve_image.c
diff --git a/load_nandsim.sh b/nand-utils/load_nandsim.sh
index 4d9f0cb..4d9f0cb 100755
--- a/load_nandsim.sh
+++ b/nand-utils/load_nandsim.sh
diff --git a/nanddump.c b/nand-utils/nanddump.c
index 4ee7ed4..4ee7ed4 100644
--- a/nanddump.c
+++ b/nand-utils/nanddump.c
diff --git a/nandtest.c b/nand-utils/nandtest.c
index 2ef7cc8..2ef7cc8 100644
--- a/nandtest.c
+++ b/nand-utils/nandtest.c
diff --git a/nandwrite.c b/nand-utils/nandwrite.c
index 9c3fe8f..9c3fe8f 100644
--- a/nandwrite.c
+++ b/nand-utils/nandwrite.c
diff --git a/nftl_format.c b/nand-utils/nftl_format.c
index 1fc3b36..1fc3b36 100644
--- a/nftl_format.c
+++ b/nand-utils/nftl_format.c
diff --git a/nftldump.c b/nand-utils/nftldump.c
index 32f4f2f..32f4f2f 100644
--- a/nftldump.c
+++ b/nand-utils/nftldump.c
diff --git a/rfddump.c b/nor-utils/rfddump.c
index 0375bac..0375bac 100644
--- a/rfddump.c
+++ b/nor-utils/rfddump.c
diff --git a/rfdformat.c b/nor-utils/rfdformat.c
index 17d9d2d..17d9d2d 100644
--- a/rfdformat.c
+++ b/nor-utils/rfdformat.c
diff --git a/mkfs.ubifs/.gitignore b/ubifs-utils/mkfs.ubifs/.gitignore
index 6b0e85c..6b0e85c 100644
--- a/mkfs.ubifs/.gitignore
+++ b/ubifs-utils/mkfs.ubifs/.gitignore
diff --git a/mkfs.ubifs/COPYING b/ubifs-utils/mkfs.ubifs/COPYING
index 60549be..60549be 100644
--- a/mkfs.ubifs/COPYING
+++ b/ubifs-utils/mkfs.ubifs/COPYING
diff --git a/mkfs.ubifs/README b/ubifs-utils/mkfs.ubifs/README
index 7e19939..7e19939 100644
--- a/mkfs.ubifs/README
+++ b/ubifs-utils/mkfs.ubifs/README
diff --git a/mkfs.ubifs/compr.c b/ubifs-utils/mkfs.ubifs/compr.c
index 34b2f60..34b2f60 100644
--- a/mkfs.ubifs/compr.c
+++ b/ubifs-utils/mkfs.ubifs/compr.c
diff --git a/mkfs.ubifs/compr.h b/ubifs-utils/mkfs.ubifs/compr.h
index e3dd95c..e3dd95c 100644
--- a/mkfs.ubifs/compr.h
+++ b/ubifs-utils/mkfs.ubifs/compr.h
diff --git a/mkfs.ubifs/crc16.c b/ubifs-utils/mkfs.ubifs/crc16.c
index a19512e..a19512e 100644
--- a/mkfs.ubifs/crc16.c
+++ b/ubifs-utils/mkfs.ubifs/crc16.c
diff --git a/mkfs.ubifs/crc16.h b/ubifs-utils/mkfs.ubifs/crc16.h
index 539d21a..539d21a 100644
--- a/mkfs.ubifs/crc16.h
+++ b/ubifs-utils/mkfs.ubifs/crc16.h
diff --git a/mkfs.ubifs/defs.h b/ubifs-utils/mkfs.ubifs/defs.h
index 1fa3316..1fa3316 100644
--- a/mkfs.ubifs/defs.h
+++ b/ubifs-utils/mkfs.ubifs/defs.h
diff --git a/mkfs.ubifs/devtable.c b/ubifs-utils/mkfs.ubifs/devtable.c
index dee035d..dee035d 100644
--- a/mkfs.ubifs/devtable.c
+++ b/ubifs-utils/mkfs.ubifs/devtable.c
diff --git a/mkfs.ubifs/hashtable/hashtable.c b/ubifs-utils/mkfs.ubifs/hashtable/hashtable.c
index c1f99ed..c1f99ed 100644
--- a/mkfs.ubifs/hashtable/hashtable.c
+++ b/ubifs-utils/mkfs.ubifs/hashtable/hashtable.c
diff --git a/mkfs.ubifs/hashtable/hashtable.h b/ubifs-utils/mkfs.ubifs/hashtable/hashtable.h
index c0b0acd..c0b0acd 100644
--- a/mkfs.ubifs/hashtable/hashtable.h
+++ b/ubifs-utils/mkfs.ubifs/hashtable/hashtable.h
diff --git a/mkfs.ubifs/hashtable/hashtable_itr.c b/ubifs-utils/mkfs.ubifs/hashtable/hashtable_itr.c
index d102453..d102453 100644
--- a/mkfs.ubifs/hashtable/hashtable_itr.c
+++ b/ubifs-utils/mkfs.ubifs/hashtable/hashtable_itr.c
diff --git a/mkfs.ubifs/hashtable/hashtable_itr.h b/ubifs-utils/mkfs.ubifs/hashtable/hashtable_itr.h
index 5c94a04..5c94a04 100644
--- a/mkfs.ubifs/hashtable/hashtable_itr.h
+++ b/ubifs-utils/mkfs.ubifs/hashtable/hashtable_itr.h
diff --git a/mkfs.ubifs/hashtable/hashtable_private.h b/ubifs-utils/mkfs.ubifs/hashtable/hashtable_private.h
index 3a558e6..3a558e6 100644
--- a/mkfs.ubifs/hashtable/hashtable_private.h
+++ b/ubifs-utils/mkfs.ubifs/hashtable/hashtable_private.h
diff --git a/mkfs.ubifs/key.h b/ubifs-utils/mkfs.ubifs/key.h
index d3a02d4..d3a02d4 100644
--- a/mkfs.ubifs/key.h
+++ b/ubifs-utils/mkfs.ubifs/key.h
diff --git a/mkfs.ubifs/lpt.c b/ubifs-utils/mkfs.ubifs/lpt.c
index 6aa0b88..6aa0b88 100644
--- a/mkfs.ubifs/lpt.c
+++ b/ubifs-utils/mkfs.ubifs/lpt.c
diff --git a/mkfs.ubifs/lpt.h b/ubifs-utils/mkfs.ubifs/lpt.h
index 4cde59d..4cde59d 100644
--- a/mkfs.ubifs/lpt.h
+++ b/ubifs-utils/mkfs.ubifs/lpt.h
diff --git a/mkfs.ubifs/mkfs.ubifs.c b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c
index ca17e2b..ca17e2b 100644
--- a/mkfs.ubifs/mkfs.ubifs.c
+++ b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c
diff --git a/mkfs.ubifs/mkfs.ubifs.h b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.h
index 944a159..944a159 100644
--- a/mkfs.ubifs/mkfs.ubifs.h
+++ b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.h
diff --git a/mkfs.ubifs/ubifs.h b/ubifs-utils/mkfs.ubifs/ubifs.h
index 434b651..434b651 100644
--- a/mkfs.ubifs/ubifs.h
+++ b/ubifs-utils/mkfs.ubifs/ubifs.h