ubi-tools: move ubigen to sort-me-out

This tool is not really needed and is unused.

Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

diff --git a/ubi-utils/Makefile b/ubi-utils/Makefile
index 155d1baa42d23e7db52f5c266e20a0a51c51ee45..68fe0fbe560cc5e5ed9d3a9534c26913e9f2979a 100644 (file)
--- a/ubi-utils/Makefile
+++ b/ubi-utils/Makefile
@@ -15,7 +15,7 @@ CFLAGS := -I./inc -I./src -I$(KERNELHDR) $(OPTFLAGS) -Werror \
 
 PERLPROGS = mkpfi ubicrc32.pl
 TARGETS = ubiupdate ubimkvol ubirmvol pfiflash pddcustomize ubimirror \
-       bin2nand nand2bin ubigen mkbootenv unubi pfi2bin ubicrc32 ubinfo \
+       bin2nand nand2bin mkbootenv unubi pfi2bin ubicrc32 ubinfo \
        ubiattach ubidetach
 
 vpath   %.c ./src
@@ -73,9 +73,6 @@ nand2bin: nand2bin.o nandecc.o nandcorr.o
 bin2nand: bin2nand.o error.o nandecc.o
        $(CC) $(LDFLAGS) -o $@ $^
 
-ubigen: ubigen.o libubigen.o crc32.o common.o
-       $(CC) $(LDFLAGS) -o $@ $^
-
 mkbootenv: mkbootenv.o bootenv.o hashmap.o error.o crc32.o
        $(CC) $(LDFLAGS) -o $@ $^
 

diff --git a/ubi-utils/sort-me-out/README b/ubi-utils/sort-me-out/README
index 7dd45c1f027d3086ae0cebbe9dc0fdad2bae32f2..8ca9bdc3dc58335d61117ab87f785fe47932f22e 100644 (file)
--- a/ubi-utils/sort-me-out/README
+++ b/ubi-utils/sort-me-out/README
@@ -3,3 +3,7 @@ This directory contains various stuff that has to be cleaned up and sorted out.
 * jffs2_test.sh: this has nothing to do to UBI. And the test is quite trivial,
   so it is questionable if it should not be deleted. Anyway, if we want this,
   it has to be moved to mtd-utils.git/tests/fs-tests.
+
+* ubigen.c: this utility adds UBI headers to an image file, but does not
+  generate the volume table. It is probably useless, but one might find it
+  interesting, so we do not drop it so far and keep here.

diff --git a/ubi-utils/src/ubigen.c b/ubi-utils/sort-me-out/ubigen.c
similarity index 100%
rename from ubi-utils/src/ubigen.c
rename to ubi-utils/sort-me-out/ubigen.c