mac80211: add the work-in-progress IBSS HT patch, with some minor fixes

[openwrt.git] / package / mtd / src / mtd.c

diff --git a/package/mtd/src/mtd.c b/package/mtd/src/mtd.c
index 92018c2..7f58165 100644 (file)
--- a/package/mtd/src/mtd.c
+++ b/package/mtd/src/mtd.c
@@ -1,13 +1,12 @@
 /*
  * mtd - simple memory technology device manipulation tool
  *
 /*
  * mtd - simple memory technology device manipulation tool
  *

- * Copyright (C) 2005 Waldemar Brodkorb <wbx@dass-it.de>,
- *                       Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2005      Waldemar Brodkorb <wbx@dass-it.de>,
+ * Copyright (C) 2005-2009 Felix Fietkau <nbd@openwrt.org>

  *
  * This program is free software; you can redistribute it and/or
  *
  * This program is free software; you can redistribute it and/or

- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * modify it under the terms of the GNU General Public License v2
+ * as published by the Free Software Foundation.

  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of


@@ -18,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *

- * $Id$

  *
  * The code is based on the linux-mtd examples.
  */
  *
  * The code is based on the linux-mtd examples.
  */


@@ -43,37 +41,23 @@
 #include <sys/stat.h>
 #include <sys/reboot.h>
 #include <linux/reboot.h>
 #include <sys/stat.h>
 #include <sys/reboot.h>
 #include <linux/reboot.h>

-

 #include "mtd-api.h"
 #include "mtd-api.h"

+#include "fis.h"
+#include "mtd.h"

 
 

-#define TRX_MAGIC       0x30524448      /* "HDR0" */
-#define BUFSIZE (16 * 1024)

 #define MAX_ARGS 8
 #define MAX_ARGS 8

+#define JFFS2_DEFAULT_DIR      "" /* directory name without /, empty means root dir */

 
 

-#define DEBUG
-
-#define JFFS2_DEFAULT_DIR      "tmp"
-
-#define SYSTYPE_UNKNOWN     0
-#define SYSTYPE_BROADCOM    1
-/* to be continued */
-
-struct trx_header {
-       uint32_t magic;         /* "HDR0" */
-       uint32_t len;           /* Length of file including header */
-       uint32_t crc32;         /* 32-bit CRC from flag_version to end of file */
-       uint32_t flag_version;  /* 0:15 flags, 16:31 version */
-       uint32_t offsets[3];    /* Offsets of partitions from start of header */
-};
-
-static char buf[BUFSIZE];
-static char *imagefile;
-static int buflen;
+static char *buf = NULL;
+static char *imagefile = NULL;
+static char *jffs2file = NULL, *jffs2dir = JFFS2_DEFAULT_DIR;
+static int buflen = 0;

 int quiet;
 int quiet;

+int no_erase;

 int mtdsize = 0;
 int erasesize = 0;
 
 int mtdsize = 0;
 int erasesize = 0;
 

-int mtd_open(const char *mtd)
+int mtd_open(const char *mtd, bool block)

 {
        FILE *fp;
        char dev[PATH_MAX];
 {
        FILE *fp;
        char dev[PATH_MAX];


@@ -84,9 +68,9 @@ int mtd_open(const char *mtd)
        if ((fp = fopen("/proc/mtd", "r"))) {
                while (fgets(dev, sizeof(dev), fp)) {
                        if (sscanf(dev, "mtd%d:", &i) && strstr(dev, mtd)) {
        if ((fp = fopen("/proc/mtd", "r"))) {
                while (fgets(dev, sizeof(dev), fp)) {
                        if (sscanf(dev, "mtd%d:", &i) && strstr(dev, mtd)) {

-                               snprintf(dev, sizeof(dev), "/dev/mtd/%d", i);
+                               snprintf(dev, sizeof(dev), "/dev/mtd%s/%d", (block ? "block" : ""), i);

                                if ((ret=open(dev, flags))<0) {
                                if ((ret=open(dev, flags))<0) {

-                                       snprintf(dev, sizeof(dev), "/dev/mtd%d", i);
+                                       snprintf(dev, sizeof(dev), "/dev/mtd%s%d", (block ? "block" : ""), i);

                                        ret=open(dev, flags);
                                }
                                fclose(fp);
                                        ret=open(dev, flags);
                                }
                                fclose(fp);


@@ -104,16 +88,16 @@ int mtd_check_open(const char *mtd)
        struct mtd_info_user mtdInfo;
        int fd;
 
        struct mtd_info_user mtdInfo;
        int fd;
 

-       fd = mtd_open(mtd);
+       fd = mtd_open(mtd, false);

        if(fd < 0) {
                fprintf(stderr, "Could not open mtd device: %s\n", mtd);
        if(fd < 0) {
                fprintf(stderr, "Could not open mtd device: %s\n", mtd);

-               return 0;
+               return -1;

        }
 
        if(ioctl(fd, MEMGETINFO, &mtdInfo)) {
                fprintf(stderr, "Could not get MTD device info from %s\n", mtd);
                close(fd);
        }
 
        if(ioctl(fd, MEMGETINFO, &mtdInfo)) {
                fprintf(stderr, "Could not get MTD device info from %s\n", mtd);
                close(fd);

-               return 0;
+               return -1;

        }
        mtdsize = mtdInfo.size;
        erasesize = mtdInfo.erasesize;
        }
        mtdsize = mtdInfo.size;
        erasesize = mtdInfo.erasesize;


@@ -128,110 +112,104 @@ int mtd_erase_block(int fd, int offset)
        mtdEraseInfo.start = offset;
        mtdEraseInfo.length = erasesize;
        ioctl(fd, MEMUNLOCK, &mtdEraseInfo);
        mtdEraseInfo.start = offset;
        mtdEraseInfo.length = erasesize;
        ioctl(fd, MEMUNLOCK, &mtdEraseInfo);

-       if (ioctl (fd, MEMERASE, &mtdEraseInfo) < 0) {
-               fprintf(stderr, "Erasing mtd failed.\n");
-               exit(1);
-       }
+       if (ioctl (fd, MEMERASE, &mtdEraseInfo) < 0)
+               return -1;
+
+       return 0;

 }
 
 }
 

-int mtd_write_buffer(int fd, char *buf, int offset, int length)
+int mtd_write_buffer(int fd, const char *buf, int offset, int length)

 {
        lseek(fd, offset, SEEK_SET);
        write(fd, buf, length);
 {
        lseek(fd, offset, SEEK_SET);
        write(fd, buf, length);

+       return 0;

 }
 
 
 }
 
 

-#ifdef target_brcm

 static int
 static int

-image_check_brcm(int imagefd, const char *mtd)
+image_check(int imagefd, const char *mtd)

 {
 {

-       struct trx_header *trx = (struct trx_header *) buf;
-       int fd;
-
-       if (strcmp(mtd, "linux") != 0)
-               return 1;
-       
-       buflen = read(imagefd, buf, 32);
-       if (buflen < 32) {
-               fprintf(stdout, "Could not get image header, file too small (%ld bytes)\n", buflen);
-               return 0;
+       int ret = 1;
+       if (trx_check) {
+         ret = trx_check(imagefd, mtd, buf, &buflen);

        }
        }

+       return ret;
+}

 
 

-       if (trx->magic != TRX_MAGIC || trx->len < sizeof(struct trx_header)) {
-               if (quiet < 2) {
-                       fprintf(stderr, "Bad trx header\n");
-                       fprintf(stderr, "This is not the correct file format; refusing to flash.\n"
-                                       "Please specify the correct file or use -f to force.\n");
-               }
-               return 0;
-       }
+static int mtd_check(const char *mtd)
+{
+       char *next = NULL;
+       char *str = NULL;
+       int fd;

 
 

-       /* check if image fits to mtd device */
-       fd = mtd_check_open(mtd);
-       if(fd < 0) {
-               fprintf(stderr, "Could not open mtd device: %s\n", mtd);
-               exit(1);
+       if (strchr(mtd, ':')) {
+               str = strdup(mtd);
+               mtd = str;

        }
 
        }
 

-       if(mtdsize < trx->len) {
-               fprintf(stderr, "Image too big for partition: %s\n", mtd);
-               close(fd);
-               return 0;
-       }       
-       
-       close(fd);
-       return 1;
-}
-#endif /* target_brcm */
+       do {
+               next = strchr(mtd, ':');
+               if (next) {
+                       *next = 0;
+                       next++;
+               }

 
 

-static int
-image_check(int imagefd, const char *mtd)
-{
-       int fd, systype;
-       size_t count;
-       char *c;
-       FILE *f;
+               fd = mtd_check_open(mtd);
+               if (fd < 0)
+                       return 0;

 
 

-#ifdef target_brcm
-       return image_check_brcm(imagefd, mtd);
-#endif
-}
+               if (!buf)
+                       buf = malloc(erasesize);

 
 

-static int mtd_check(const char *mtd)
-{
-       int fd;
+               close(fd);
+               mtd = next;
+       } while (next);

 
 

-       fd = mtd_check_open(mtd);
-       if (!fd)
-               return 0;
+       if (str)
+               free(str);

 
 

-       close(fd);

        return 1;
 }
 
 static int
 mtd_unlock(const char *mtd)
 {
        return 1;
 }
 
 static int
 mtd_unlock(const char *mtd)
 {

-       int fd;

        struct erase_info_user mtdLockInfo;
        struct erase_info_user mtdLockInfo;

+       char *next = NULL;
+       char *str = NULL;
+       int fd;

 
 

-       fd = mtd_check_open(mtd);
-       if(fd <= 0) {
-               fprintf(stderr, "Could not open mtd device: %s\n", mtd);
-               exit(1);
+       if (strchr(mtd, ':')) {
+               str = strdup(mtd);
+               mtd = str;

        }
 
        }
 

-       if (quiet < 2) 
-               fprintf(stderr, "Unlocking %s ...\n", mtd);
+       do {
+               next = strchr(mtd, ':');
+               if (next) {
+                       *next = 0;
+                       next++;
+               }
+
+               fd = mtd_check_open(mtd);
+               if(fd < 0) {
+                       fprintf(stderr, "Could not open mtd device: %s\n", mtd);
+                       exit(1);
+               }

 
 

-       mtdLockInfo.start = 0;
-       mtdLockInfo.length = mtdsize;
-       if(ioctl(fd, MEMUNLOCK, &mtdLockInfo)) {
+               if (quiet < 2)
+                       fprintf(stderr, "Unlocking %s ...\n", mtd);
+
+               mtdLockInfo.start = 0;
+               mtdLockInfo.length = mtdsize;
+               ioctl(fd, MEMUNLOCK, &mtdLockInfo);

                close(fd);
                close(fd);

-               return 0;
-       }
-               
-       close(fd);
+               mtd = next;
+       } while (next);
+
+       if (str)
+               free(str);
+

        return 0;
 }
 
        return 0;
 }
 


@@ -245,7 +223,7 @@ mtd_erase(const char *mtd)
                fprintf(stderr, "Erasing %s ...\n", mtd);
 
        fd = mtd_check_open(mtd);
                fprintf(stderr, "Erasing %s ...\n", mtd);
 
        fd = mtd_check_open(mtd);

-       if(fd <= 0) {
+       if(fd < 0) {

                fprintf(stderr, "Could not open mtd device: %s\n", mtd);
                exit(1);
        }
                fprintf(stderr, "Could not open mtd device: %s\n", mtd);
                exit(1);
        }


@@ -255,11 +233,11 @@ mtd_erase(const char *mtd)
        for (mtdEraseInfo.start = 0;
                 mtdEraseInfo.start < mtdsize;
                 mtdEraseInfo.start += erasesize) {
        for (mtdEraseInfo.start = 0;
                 mtdEraseInfo.start < mtdsize;
                 mtdEraseInfo.start += erasesize) {

-               
+

                ioctl(fd, MEMUNLOCK, &mtdEraseInfo);
                if(ioctl(fd, MEMERASE, &mtdEraseInfo))
                        fprintf(stderr, "Failed to erase block on %s at 0x%x\n", mtd, mtdEraseInfo.start);
                ioctl(fd, MEMUNLOCK, &mtdEraseInfo);
                if(ioctl(fd, MEMERASE, &mtdEraseInfo))
                        fprintf(stderr, "Failed to erase block on %s at 0x%x\n", mtd, mtdEraseInfo.start);

-       }               
+       }

 
        close(fd);
        return 0;
 
        close(fd);
        return 0;


@@ -275,7 +253,7 @@ mtd_refresh(const char *mtd)
                fprintf(stderr, "Refreshing mtd partition %s ... ", mtd);
 
        fd = mtd_check_open(mtd);
                fprintf(stderr, "Refreshing mtd partition %s ... ", mtd);
 
        fd = mtd_check_open(mtd);

-       if(fd <= 0) {
+       if(fd < 0) {

                fprintf(stderr, "Could not open mtd device: %s\n", mtd);
                exit(1);
        }
                fprintf(stderr, "Could not open mtd device: %s\n", mtd);
                exit(1);
        }


@@ -293,51 +271,191 @@ mtd_refresh(const char *mtd)
        return 0;
 }
 
        return 0;
 }
 

+static void
+indicate_writing(const char *mtd)
+{
+       if (quiet < 2)
+               fprintf(stderr, "\nWriting from %s to %s ... ", imagefile, mtd);
+
+       if (!quiet)
+               fprintf(stderr, " [ ]");
+}
+

 static int
 static int

-mtd_write(int imagefd, const char *mtd)
+mtd_write(int imagefd, const char *mtd, char *fis_layout)

 {
 {

-       int fd, i, result;
-       size_t r, w, e;
-       struct erase_info_user mtdEraseInfo;
-       int ret = 0;
+       char *next = NULL;
+       char *str = NULL;
+       int fd, result;
+       ssize_t r, w, e;
+       ssize_t skip = 0;
+       uint32_t offset = 0;
+
+#ifdef FIS_SUPPORT
+       static struct fis_part new_parts[MAX_ARGS];
+       static struct fis_part old_parts[MAX_ARGS];
+       int n_new = 0, n_old = 0;
+
+       if (fis_layout) {
+               const char *tmp = mtd;
+               char *word, *brkt;
+               int ret;
+
+               memset(&old_parts, 0, sizeof(old_parts));
+               memset(&new_parts, 0, sizeof(new_parts));
+
+               do {
+                       next = strchr(tmp, ':');
+                       if (!next)
+                               next = (char *) tmp + strlen(tmp);
+
+                       memcpy(old_parts[n_old].name, tmp, next - tmp);
+
+                       n_old++;
+                       tmp = next + 1;
+               } while(*next);
+
+               for (word = strtok_r(fis_layout, ",", &brkt);
+                    word;
+                        word = strtok_r(NULL, ",", &brkt)) {
+
+                       tmp = strtok(word, ":");
+                       strncpy((char *) new_parts[n_new].name, tmp, sizeof(new_parts[n_new].name) - 1);
+
+                       tmp = strtok(NULL, ":");
+                       if (!tmp)
+                               goto next;
+
+                       new_parts[n_new].size = strtoul(tmp, NULL, 0);
+
+                       tmp = strtok(NULL, ":");
+                       if (!tmp)
+                               goto next;
+
+                       new_parts[n_new].loadaddr = strtoul(tmp, NULL, 16);
+next:
+                       n_new++;
+               }
+               ret = fis_validate(old_parts, n_old, new_parts, n_new);
+               if (ret < 0) {
+                       fprintf(stderr, "Failed to validate the new FIS partition table\n");
+                       exit(1);
+               }
+               if (ret == 0)
+                       fis_layout = NULL;
+       }
+#endif
+
+       if (strchr(mtd, ':')) {
+               str = strdup(mtd);
+               mtd = str;
+       }
+
+       r = 0;
+
+resume:
+       next = strchr(mtd, ':');
+       if (next) {
+               *next = 0;
+               next++;
+       }

 
        fd = mtd_check_open(mtd);
        if(fd < 0) {
                fprintf(stderr, "Could not open mtd device: %s\n", mtd);
                exit(1);
        }
 
        fd = mtd_check_open(mtd);
        if(fd < 0) {
                fprintf(stderr, "Could not open mtd device: %s\n", mtd);
                exit(1);
        }

-               
-       if (quiet < 2)
-               fprintf(stderr, "Writing from %s to %s ... ", imagefile, mtd);

 
 

-       r = w = e = 0;
-       if (!quiet)
-               fprintf(stderr, " [ ]");
+       indicate_writing(mtd);

 
 

+       w = e = 0;

        for (;;) {
        for (;;) {

-               /* buffer may contain data already (from trx check) */
-               r = buflen;
-               r += read(imagefd, buf + buflen, BUFSIZE - buflen);
-               w += r;
+               /* buffer may contain data already (from trx check or last mtd partition write attempt) */
+               while (buflen < erasesize) {
+                       r = read(imagefd, buf + buflen, erasesize - buflen);
+                       if (r < 0) {
+                               if ((errno == EINTR) || (errno == EAGAIN))
+                                       continue;
+                               else {
+                                       perror("read");
+                                       break;
+                               }
+                       }

 
 

-               /* EOF */
-               if (r <= 0) break;
+                       if (r == 0)
+                               break;

 
 

-               /* need to erase the next block before writing data to it */
-               while (w > e) {
-                       if (!quiet)
-                               fprintf(stderr, "\b\b\b[e]");
+                       buflen += r;
+               }
+
+               if (buflen == 0)
+                       break;
+
+               if (skip > 0) {
+                       skip -= buflen;
+                       buflen = 0;
+                       if (skip <= 0)
+                               indicate_writing(mtd);
+
+                       continue;
+               }

 
 

-                       mtd_erase_block(fd, e);
+               if (jffs2file) {
+                       if (memcmp(buf, JFFS2_EOF, sizeof(JFFS2_EOF) - 1) == 0) {
+                               if (!quiet)
+                                       fprintf(stderr, "\b\b\b   ");
+                               if (quiet < 2)
+                                       fprintf(stderr, "\nAppending jffs2 data from %s to %s...", jffs2file, mtd);
+                               /* got an EOF marker - this is the place to add some jffs2 data */
+                               skip = mtd_replace_jffs2(mtd, fd, e, jffs2file);
+
+                               w += skip;
+                               e += skip;
+                               skip -= buflen;
+                               buflen = 0;
+                               offset = 0;
+                               continue;
+                       }
+                       /* no EOF marker, make sure we figure out the last inode number
+                        * before appending some data */
+                       mtd_parse_jffs2data(buf, jffs2dir);
+               }

 
 

-                       /* erase the chunk */
-                       e += erasesize;
+               /* need to erase the next block before writing data to it */
+               if(!no_erase)
+               {
+                       while (w + buflen > e) {
+                               if (!quiet)
+                                       fprintf(stderr, "\b\b\b[e]");
+
+
+                               if (mtd_erase_block(fd, e) < 0) {
+                                       if (next) {
+                                               if (w < e) {
+                                                       write(fd, buf + offset, e - w);
+                                                       offset = e - w;
+                                               }
+                                               w = 0;
+                                               e = 0;
+                                               close(fd);
+                                               mtd = next;
+                                               fprintf(stderr, "\b\b\b   \n");
+                                               goto resume;
+                                       } else {
+                                               fprintf(stderr, "Failed to erase block\n");
+                                               exit(1);
+                                       }
+                               }
+
+                               /* erase the chunk */
+                               e += erasesize;
+                       }

                }
                }

-               
+

                if (!quiet)
                        fprintf(stderr, "\b\b\b[w]");
                if (!quiet)
                        fprintf(stderr, "\b\b\b[w]");

-               
-               if ((result = write(fd, buf, r)) < r) {
+
+               if ((result = write(fd, buf + offset, buflen)) < buflen) {

                        if (result < 0) {
                                fprintf(stderr, "Error writing image.\n");
                                exit(1);
                        if (result < 0) {
                                fprintf(stderr, "Error writing image.\n");
                                exit(1);


@@ -346,36 +464,65 @@ mtd_write(int imagefd, const char *mtd)
                                exit(1);
                        }
                }
                                exit(1);
                        }
                }

-               
+               w += buflen;
+

                buflen = 0;
                buflen = 0;

+               offset = 0;

        }
        }

+

        if (!quiet)
        if (!quiet)

-               fprintf(stderr, "\b\b\b\b");
+               fprintf(stderr, "\b\b\b\b    ");

 
 

+done:

        if (quiet < 2)
                fprintf(stderr, "\n");
 
        if (quiet < 2)
                fprintf(stderr, "\n");
 

+#ifdef FIS_SUPPORT
+       if (fis_layout) {
+               if (fis_remap(old_parts, n_old, new_parts, n_new) < 0)
+                       fprintf(stderr, "Failed to update the FIS partition table\n");
+       }
+#endif
+

        close(fd);
        return 0;
 }
 
 static void usage(void)
 {
        close(fd);
        return 0;
 }
 
 static void usage(void)
 {

-       fprintf(stderr, "Usage: mtd [<options> ...] <command> [<arguments> ...] <device>\n\n"
+       fprintf(stderr, "Usage: mtd [<options> ...] <command> [<arguments> ...] <device>[:<device>...]\n\n"

        "The device is in the format of mtdX (eg: mtd4) or its label.\n"
        "mtd recognizes these commands:\n"
        "        unlock                  unlock the device\n"
        "        refresh                 refresh mtd partition\n"
        "        erase                   erase all data on device\n"
        "        write <imagefile>|-     write <imagefile> (use - for stdin) to device\n"
        "The device is in the format of mtdX (eg: mtd4) or its label.\n"
        "mtd recognizes these commands:\n"
        "        unlock                  unlock the device\n"
        "        refresh                 refresh mtd partition\n"
        "        erase                   erase all data on device\n"
        "        write <imagefile>|-     write <imagefile> (use - for stdin) to device\n"

-       "        jffs2write <file>       append <file> to the jffs2 partition on the device\n"
+       "        jffs2write <file>       append <file> to the jffs2 partition on the device\n");
+       if (mtd_fixtrx) {
+           fprintf(stderr,
+       "        fixtrx                  fix the checksum in a trx header on first boot\n");
+       }
+    fprintf(stderr,    

        "Following options are available:\n"
        "        -q                      quiet mode (once: no [w] on writing,\n"
        "                                           twice: no status messages)\n"
        "Following options are available:\n"
        "        -q                      quiet mode (once: no [w] on writing,\n"
        "                                           twice: no status messages)\n"

+       "        -n                      write without first erasing the blocks\n"

        "        -r                      reboot after successful command\n"
        "        -f                      force write without trx checks\n"
        "        -e <device>             erase <device> before executing the command\n"
        "        -d <name>               directory for jffs2write, defaults to \"tmp\"\n"
        "        -r                      reboot after successful command\n"
        "        -f                      force write without trx checks\n"
        "        -e <device>             erase <device> before executing the command\n"
        "        -d <name>               directory for jffs2write, defaults to \"tmp\"\n"

+       "        -j <name>               integrate <file> into jffs2 data when writing an image\n");
+       if (mtd_fixtrx) {
+           fprintf(stderr,
+       "        -o offset               offset of the image header in the partition(for fixtrx)\n");
+    }
+       fprintf(stderr,
+#ifdef FIS_SUPPORT
+       "        -F <part>[:<size>[:<entrypoint>]][,<part>...]\n"
+       "                                alter the fis partition table to create new partitions replacing\n"
+       "                                the partitions provided as argument to the write command\n"
+       "                                (only valid together with the write command)\n"
+#endif

        "\n"
        "Example: To write linux.trx to mtd4 labeled as linux and reboot afterwards\n"
        "         mtd -r write linux.trx linux\n\n");
        "\n"
        "Example: To write linux.trx to mtd4 labeled as linux and reboot afterwards\n"
        "         mtd -r write linux.trx linux\n\n");


@@ -397,24 +544,31 @@ static void do_reboot(void)
 
 int main (int argc, char **argv)
 {
 
 int main (int argc, char **argv)
 {

-       int ch, i, boot, unlock, imagefd, force, unlocked;
-       char *erase[MAX_ARGS], *device;
-       char *jffs2dir = JFFS2_DEFAULT_DIR;
+       int ch, i, boot, imagefd = 0, force, unlocked;
+       char *erase[MAX_ARGS], *device = NULL;
+       char *fis_layout = NULL;
+       size_t offset = 0;

        enum {
                CMD_ERASE,
                CMD_WRITE,
                CMD_UNLOCK,
                CMD_REFRESH,
        enum {
                CMD_ERASE,
                CMD_WRITE,
                CMD_UNLOCK,
                CMD_REFRESH,

-               CMD_JFFS2WRITE
-       } cmd;
-       
+               CMD_JFFS2WRITE,
+               CMD_FIXTRX,
+       } cmd = -1;
+

        erase[0] = NULL;
        boot = 0;
        force = 0;
        buflen = 0;
        quiet = 0;
        erase[0] = NULL;
        boot = 0;
        force = 0;
        buflen = 0;
        quiet = 0;

+  no_erase = 0;

 
 

-       while ((ch = getopt(argc, argv, "frqe:d:")) != -1)
+       while ((ch = getopt(argc, argv,
+#ifdef FIS_SUPPORT
+                       "F:"
+#endif
+                       "frnqe:d:j:o:")) != -1)

                switch (ch) {
                        case 'f':
                                force = 1;
                switch (ch) {
                        case 'f':
                                force = 1;


@@ -422,6 +576,12 @@ int main (int argc, char **argv)
                        case 'r':
                                boot = 1;
                                break;
                        case 'r':
                                boot = 1;
                                break;

+                       case 'n':
+                               no_erase = 1;
+                               break;
+                       case 'j':
+                               jffs2file = optarg;
+                               break;

                        case 'q':
                                quiet++;
                                break;
                        case 'q':
                                quiet++;
                                break;


@@ -429,20 +589,37 @@ int main (int argc, char **argv)
                                i = 0;
                                while ((erase[i] != NULL) && ((i + 1) < MAX_ARGS))
                                        i++;
                                i = 0;
                                while ((erase[i] != NULL) && ((i + 1) < MAX_ARGS))
                                        i++;

-                                       
+

                                erase[i++] = optarg;
                                erase[i] = NULL;
                                break;
                        case 'd':
                                jffs2dir = optarg;
                                break;
                                erase[i++] = optarg;
                                erase[i] = NULL;
                                break;
                        case 'd':
                                jffs2dir = optarg;
                                break;

+                       case 'o':
+                               if (!mtd_fixtrx) {
+                                       fprintf(stderr, "-o: is not available on this platform\n");
+                                       usage();
+                               }
+                               errno = 0;
+                               offset = strtoul(optarg, 0, 0);
+                               if (errno) {
+                                       fprintf(stderr, "-o: illegal numeric string\n");
+                                       usage();
+                               }
+                               break;
+#ifdef FIS_SUPPORT
+                       case 'F':
+                               fis_layout = optarg;
+                               break;
+#endif

                        case '?':
                        default:
                                usage();
                }
        argc -= optind;
        argv += optind;
                        case '?':
                        default:
                                usage();
                }
        argc -= optind;
        argv += optind;

-       
+

        if (argc < 2)
                usage();
 
        if (argc < 2)
                usage();
 


@@ -455,10 +632,13 @@ int main (int argc, char **argv)
        } else if ((strcmp(argv[0], "erase") == 0) && (argc == 2)) {
                cmd = CMD_ERASE;
                device = argv[1];
        } else if ((strcmp(argv[0], "erase") == 0) && (argc == 2)) {
                cmd = CMD_ERASE;
                device = argv[1];

+       } else if (((strcmp(argv[0], "fixtrx") == 0) && (argc == 2)) && mtd_fixtrx) {
+               cmd = CMD_FIXTRX;
+               device = argv[1];

        } else if ((strcmp(argv[0], "write") == 0) && (argc == 3)) {
                cmd = CMD_WRITE;
                device = argv[2];
        } else if ((strcmp(argv[0], "write") == 0) && (argc == 3)) {
                cmd = CMD_WRITE;
                device = argv[2];

-       
+

                if (strcmp(argv[1], "-") == 0) {
                        imagefile = "<stdin>";
                        imagefd = 0;
                if (strcmp(argv[1], "-") == 0) {
                        imagefile = "<stdin>";
                        imagefd = 0;


@@ -469,23 +649,20 @@ int main (int argc, char **argv)
                                exit(1);
                        }
                }
                                exit(1);
                        }
                }

-       
+
+               if (!mtd_check(device)) {
+                       fprintf(stderr, "Can't open device for writing!\n");
+                       exit(1);
+               }

                /* check trx file before erasing or writing anything */
                /* check trx file before erasing or writing anything */

-               if (!image_check(imagefd, device)) {
-                       if (!force) {
-                               fprintf(stderr, "Image check failed.\n");
-                               exit(1);
-                       }
-               } else {
-                       if (!mtd_check(device)) {
-                               fprintf(stderr, "Can't open device for writing!\n");
-                               exit(1);
-                       }
+               if (!image_check(imagefd, device) && !force) {
+                       fprintf(stderr, "Image check failed.\n");
+                       exit(1);

                }
        } else if ((strcmp(argv[0], "jffs2write") == 0) && (argc == 3)) {
                cmd = CMD_JFFS2WRITE;
                device = argv[2];
                }
        } else if ((strcmp(argv[0], "jffs2write") == 0) && (argc == 3)) {
                cmd = CMD_JFFS2WRITE;
                device = argv[2];

-       
+

                imagefile = argv[1];
                if (!mtd_check(device)) {
                        fprintf(stderr, "Can't open device for writing!\n");
                imagefile = argv[1];
                if (!mtd_check(device)) {
                        fprintf(stderr, "Can't open device for writing!\n");


@@ -496,7 +673,7 @@ int main (int argc, char **argv)
        }
 
        sync();
        }
 
        sync();

-       
+

        i = 0;
        unlocked = 0;
        while (erase[i] != NULL) {
        i = 0;
        unlocked = 0;
        while (erase[i] != NULL) {


@@ -506,8 +683,7 @@ int main (int argc, char **argv)
                        unlocked = 1;
                i++;
        }
                        unlocked = 1;
                i++;
        }

-       
-               
+

        switch (cmd) {
                case CMD_UNLOCK:
                        if (!unlocked)
        switch (cmd) {
                case CMD_UNLOCK:
                        if (!unlocked)


@@ -521,7 +697,7 @@ int main (int argc, char **argv)
                case CMD_WRITE:
                        if (!unlocked)
                                mtd_unlock(device);
                case CMD_WRITE:
                        if (!unlocked)
                                mtd_unlock(device);

-                       mtd_write(imagefd, device);
+                       mtd_write(imagefd, device, fis_layout);

                        break;
                case CMD_JFFS2WRITE:
                        if (!unlocked)
                        break;
                case CMD_JFFS2WRITE:
                        if (!unlocked)


@@ -531,10 +707,15 @@ int main (int argc, char **argv)
                case CMD_REFRESH:
                        mtd_refresh(device);
                        break;
                case CMD_REFRESH:
                        mtd_refresh(device);
                        break;

+               case CMD_FIXTRX:
+                   if (mtd_fixtrx) {
+                           mtd_fixtrx(device, offset);
+            }
+                       break;

        }
 
        sync();
        }
 
        sync();

-       
+

        if (boot)
                do_reboot();
 
        if (boot)
                do_reboot();