ubi-utils: move various stuff to sort-me-out

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

diff --git a/ubi-utils/Makefile b/ubi-utils/Makefile
index 68fe0fbe560cc5e5ed9d3a9534c26913e9f2979a..e425d6abaaf3234137be8224a9673066d69f228d 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 mkbootenv unubi pfi2bin ubicrc32 ubinfo \
+       mkbootenv unubi pfi2bin ubicrc32 ubinfo \
        ubiattach ubidetach
 
 vpath   %.c ./src
@@ -55,6 +55,9 @@ ubimkvol: ubimkvol.o common.o libubi.o
 ubirmvol: ubirmvol.o common.o libubi.o
        $(CC) $(LDFLAGS) -o $@ $^
 
+ubicrc32: ubicrc32.o crc32.o
+       $(CC) $(LDFLAGS) -o $@ $^
+
 pddcustomize: pddcustomize.o error.o libubimirror.o bootenv.o hashmap.o \
                libubi.o crc32.o
        $(CC) $(LDFLAGS) -o $@ $^
@@ -67,12 +70,6 @@ ubimirror: ubimirror.o error.o libubimirror.o bootenv.o hashmap.o \
                libubi.o crc32.o
        $(CC) $(LDFLAGS) -o $@ $^
 
-nand2bin: nand2bin.o nandecc.o nandcorr.o
-       $(CC) $(LDFLAGS) -o $@ $^
-
-bin2nand: bin2nand.o error.o nandecc.o
-       $(CC) $(LDFLAGS) -o $@ $^
-
 mkbootenv: mkbootenv.o bootenv.o hashmap.o error.o crc32.o
        $(CC) $(LDFLAGS) -o $@ $^
 
@@ -83,9 +80,6 @@ pfi2bin: pfi2bin.o peb.o error.o list.o crc32.o libubigen.o bootenv.o \
                hashmap.o reader.o pfi.o
        $(CC) $(LDFLAGS) -o $@ $^
 
-ubicrc32: ubicrc32.o crc32.o
-       $(CC) $(LDFLAGS) -o $@ $^
-
 install: ${TARGETS}
        mkdir -p ${DESTDIR}/${SBINDIR}
        install -m0755 ${TARGETS} ${DESTDIR}/${SBINDIR}/

diff --git a/ubi-utils/TODO b/ubi-utils/TODO
deleted file mode 100644 (file)
index 63a0767..0000000
--- a/ubi-utils/TODO
+++ /dev/null
@@ -1,8 +0,0 @@
-TODO
-====
-
- * The tests from the scripts/ directory should live in
-   mtd-utils/tests/ubi-tests/ and it would be nice to have a short
-   description of the tests
- * May we please split UBI-related stuff and pure NAND-related stuff and
-   not to keep this all in one.

diff --git a/ubi-utils/scripts/README b/ubi-utils/scripts/README
deleted file mode 100644 (file)
index 01c7453..0000000
--- a/ubi-utils/scripts/README
+++ /dev/null
@@ -1,14 +0,0 @@
-README
-======
-
-This procedure creates a test pfi which should be flashed to our
-system with pfiflash. The testcase should read the data back and 
-compare with the original.
-
-We should try not forget to run these tests before we release 
-a new version of UBI.
-
-Frank
-
-Please guys, clean up this and move the tests to mtd-utils/tests/
-Artem.

diff --git a/ubi-utils/scripts/Makefile b/ubi-utils/sort-me-out/Makefile
similarity index 100%
rename from ubi-utils/scripts/Makefile
rename to ubi-utils/sort-me-out/Makefile

diff --git a/ubi-utils/sort-me-out/README b/ubi-utils/sort-me-out/README
index 8ca9bdc3dc58335d61117ab87f785fe47932f22e..40185678b7fbb484feaed0d7e47799debe016f39 100644 (file)
--- a/ubi-utils/sort-me-out/README
+++ b/ubi-utils/sort-me-out/README
@@ -7,3 +7,44 @@ This directory contains various stuff that has to be cleaned up and sorted out.
 * 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.
+
+* bin2nand2bin_test.sh: tests nand2bin and bin2nand utilities. Should probably
+  go to some tests/tools-tests or something. the nand2bin and bin2nand
+  utilities themselves have nothing to do to UBI in general and should not sit
+  in ubi-utils. Should be moved somewhere like mtd-utils.git/nand-tools/
+
+* f64_nor_sample.cfg, f128_nand_sample.cfg: just exampe of configuration files
+  for the mkpfi utility. Not too useful without any documentation. Some pfi
+  configuration file format documentation has to be added to mkpfi man page and
+  these files should probably be added there.
+
+* pdd.txt: not sure what is it, this is probably something specific to the
+  setup which is used by IBM guys (Frank, Andreas, Josh). This is probably not
+  of general interest and should go away.
+
+* run_all.sh: runns "all" test.
+
+* ubicrc32.pl: probably redundand as we already have a C ubicrc32 utility.
+
+* ubi_test.sh: some UBI testing script, should go to
+  mtd-utils.git/tests/ubi-tests.
+
+* unubi_test.sh: tests the "unubi" utility, should go somewhere like
+  tests/tools-tests
+
+* inject_biterror.pl: injects a bit error to a binary image. Does not relate to
+  UBI and should go to mtd-utils.git/nand-tools/ or something
+
+* Makefile: previously was sitting at ubi-tools/scripts and prepared fake image
+  files for test scripts.
+
+* test.cfg: mkpfi configuration file for ubi_tools_test.sh
+
+* ubi_tools_test.sh: similar to unubi_test.sh
+
+* nand2bin.c, bin2nand.c: useful utilities which should go to
+  mtd-utils.git/nand-tools/
+
+* nandecc.c, nandecc.h: needed to compile nand2bin and bin2nand
+
+* nandcorr.c: seems to be unused

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

diff --git a/ubi-utils/scripts/bin2nand2bin_test.sh b/ubi-utils/sort-me-out/bin2nand2bin_test.sh
old mode 100644 (file)
new mode 100755 (executable)
similarity index 100%
rename from ubi-utils/scripts/bin2nand2bin_test.sh
rename to ubi-utils/sort-me-out/bin2nand2bin_test.sh

diff --git a/ubi-utils/scripts/f128_nand_sample.cfg b/ubi-utils/sort-me-out/f128_nand_sample.cfg
similarity index 100%
rename from ubi-utils/scripts/f128_nand_sample.cfg
rename to ubi-utils/sort-me-out/f128_nand_sample.cfg

diff --git a/ubi-utils/scripts/f64_nor_sample.cfg b/ubi-utils/sort-me-out/f64_nor_sample.cfg
similarity index 100%
rename from ubi-utils/scripts/f64_nor_sample.cfg
rename to ubi-utils/sort-me-out/f64_nor_sample.cfg

diff --git a/ubi-utils/scripts/inject_biterror.pl b/ubi-utils/sort-me-out/inject_biterror.pl
old mode 100644 (file)
new mode 100755 (executable)
similarity index 100%
rename from ubi-utils/scripts/inject_biterror.pl
rename to ubi-utils/sort-me-out/inject_biterror.pl

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

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

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

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

diff --git a/ubi-utils/scripts/pdd.txt b/ubi-utils/sort-me-out/pdd.txt
similarity index 100%
rename from ubi-utils/scripts/pdd.txt
rename to ubi-utils/sort-me-out/pdd.txt

diff --git a/ubi-utils/scripts/run_all.sh b/ubi-utils/sort-me-out/run_all.sh
similarity index 100%
rename from ubi-utils/scripts/run_all.sh
rename to ubi-utils/sort-me-out/run_all.sh

diff --git a/ubi-utils/scripts/test.cfg b/ubi-utils/sort-me-out/test.cfg
similarity index 100%
rename from ubi-utils/scripts/test.cfg
rename to ubi-utils/sort-me-out/test.cfg

diff --git a/ubi-utils/scripts/ubi_test.sh b/ubi-utils/sort-me-out/ubi_test.sh
similarity index 100%
rename from ubi-utils/scripts/ubi_test.sh
rename to ubi-utils/sort-me-out/ubi_test.sh

diff --git a/ubi-utils/scripts/ubi_tools_test.sh b/ubi-utils/sort-me-out/ubi_tools_test.sh
similarity index 100%
rename from ubi-utils/scripts/ubi_tools_test.sh
rename to ubi-utils/sort-me-out/ubi_tools_test.sh

diff --git a/ubi-utils/scripts/ubicrc32.pl b/ubi-utils/sort-me-out/ubicrc32.pl
similarity index 100%
rename from ubi-utils/scripts/ubicrc32.pl
rename to ubi-utils/sort-me-out/ubicrc32.pl

diff --git a/ubi-utils/scripts/unubi_test.sh b/ubi-utils/sort-me-out/unubi_test.sh
similarity index 100%
rename from ubi-utils/scripts/unubi_test.sh
rename to ubi-utils/sort-me-out/unubi_test.sh