nandwrite: kill `--raw' option

The `--raw' option has lost all usefulness as it overlapped with several
other OOB modes. I cannot even figure out what it was actually intended
to do, but I'm sure its functionality fits somewhere in the
MTD_OPS_{AUTO_OOB,PLACE_OOB,RAW} options, which are mostly implemented
in libmtd's mtd_write().

I don't think users need a warning for this one, unless someone can tell
me what it actually was supposed to have done in the first place.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@intel.com>

diff --git a/nandwrite.c b/nandwrite.c
index 920863f7a61f758c370701ec2dfec656da0f3890..45782c7f067ef2166e9bc864690117ba60bea130 100644 (file)
--- a/nandwrite.c
+++ b/nandwrite.c
@@ -54,7 +54,6 @@ static void display_help(void)
 "  -N, --noskipbad         Write without bad block skipping\n"
 "  -o, --oob               Image contains oob data\n"
 "  -O, --onlyoob           Image contains oob data and only write the oob part\n"
-"  -r, --raw               Image contains the raw oob data dumped by nanddump\n"
 "  -s addr, --start=addr   Set start address (default is 0)\n"
 "  -p, --pad               Pad to page size\n"
 "  -b, --blockalign=1|2|4  Set multiple of eraseblocks to align to\n"
@@ -86,7 +85,6 @@ static const char     *mtd_device, *img;
 static long long       mtdoffset = 0;
 static bool            quiet = false;
 static bool            writeoob = false;
-static bool            rawoob = false;
 static bool            onlyoob = false;
 static bool            markbad = false;
 static bool            noecc = false;
@@ -100,7 +98,7 @@ static void process_options(int argc, char * const argv[])
 
        for (;;) {
                int option_index = 0;
-               static const char *short_options = "b:mnNoOpqrs:";
+               static const char *short_options = "b:mnNoOpqs:";
                static const struct option long_options[] = {
                        {"help", no_argument, 0, 0},
                        {"version", no_argument, 0, 0},
@@ -112,7 +110,6 @@ static void process_options(int argc, char * const argv[])
                        {"onlyoob", no_argument, 0, 'O'},
                        {"pad", no_argument, 0, 'p'},
                        {"quiet", no_argument, 0, 'q'},
-                       {"raw", no_argument, 0, 'r'},
                        {"start", required_argument, 0, 's'},
                        {0, 0, 0, 0},
                };
@@ -156,10 +153,6 @@ static void process_options(int argc, char * const argv[])
                        case 'p':
                                pad = true;
                                break;
-                       case 'r':
-                               rawoob = true;
-                               writeoob = true;
-                               break;
                        case 's':
                                mtdoffset = simple_strtoll(optarg, &error);
                                break;