4 files changed, 6 insertions, 5 deletions
diff --git a/ubi-utils/Makefile b/ubi-utils/Makefile
index 517c8ec..c551c02 100644
--- a/ubi-utils/Makefile
+++ b/ubi-utils/Makefile
@@ -14,7 +14,7 @@ CFLAGS := -I./inc -I./src -I$(KERNELHDR) $(OPTFLAGS) -Werror \
 	-Wwrite-strings -W -std=gnu99 -DPACKAGE_VERSION=\"1.0\"
 
 PERLPROGS = mkpfi ubicrc32.pl
-TARGETS = ubiupdate ubimkvol ubirmvol pfiflash pddcustomize ubimirror \
+TARGETS = ubiupdate ubimkvol ubirmvol pddcustomize ubimirror \
 	unubi pfi2bin ubicrc32 ubinfo \
 	ubiattach ubidetach
 
@@ -62,10 +62,6 @@ pddcustomize: pddcustomize.o error.o libubimirror.o bootenv.o hashmap.o \
 		libubi.o crc32.o
 	$(CC) $(LDFLAGS) -o $@ $^
 
-pfiflash: pfiflash.o libpfiflash.o list.o reader.o error.o libubimirror.o \
-		bootenv.o hashmap.o pfi.o libubi.o crc32.o
-	$(CC) $(LDFLAGS) -o $@ $^
-
 ubimirror: ubimirror.o error.o libubimirror.o bootenv.o hashmap.o \
 		libubi.o crc32.o
 	$(CC) $(LDFLAGS) -o $@ $^
diff --git a/ubi-utils/sort-me-out/README b/ubi-utils/sort-me-out/README
index 6a24555..b52e28b 100644
--- a/ubi-utils/sort-me-out/README
+++ b/ubi-utils/sort-me-out/README
@@ -51,3 +51,8 @@ This directory contains various stuff that has to be cleaned up and sorted out.
 
 * mkbootenv.c: no idea what is this about. Looks like something specific to IBM
   guys's setup.
+
+* pfiflash*: an utility to update UBI volumes described by a pfi file on
+  target. Nothing wrong with it, but it seems to be rather specific to IBM
+  guys' environment and it should be cleaned-up. It also should be documented
+  better.
diff --git a/ubi-utils/src/pfiflash.c b/ubi-utils/sort-me-out/pfiflash.c
index 754fe33..754fe33 100644
--- a/ubi-utils/src/pfiflash.c
+++ b/ubi-utils/sort-me-out/pfiflash.c
diff --git a/ubi-utils/src/pfiflash_error.h b/ubi-utils/sort-me-out/pfiflash_error.h
index 0f27f4a..0f27f4a 100644
--- a/ubi-utils/src/pfiflash_error.h
+++ b/ubi-utils/sort-me-out/pfiflash_error.h