mtd: add fixwrgg command

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

diff --git a/package/system/mtd/src/mtd.c b/package/system/mtd/src/mtd.c
index eda001e1d8516313782bd317a6ab01d92b953b02..e66e647c0135625bf57cbad69268063008642de3 100644 (file)
--- a/package/system/mtd/src/mtd.c
+++ b/package/system/mtd/src/mtd.c
@@ -2,7 +2,7 @@
  * mtd - simple memory technology device manipulation tool
  *
  * Copyright (C) 2005      Waldemar Brodkorb <wbx@dass-it.de>,
- * Copyright (C) 2005-2009 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2005-2009 Felix Fietkau <nbd@nbd.name>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License v2
@@ -23,6 +23,7 @@
 
 #define _GNU_SOURCE
 #include <byteswap.h>
+#include <endian.h>
 #include <limits.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -53,6 +54,7 @@
 
 #define TRX_MAGIC              0x48445230      /* "HDR0" */
 #define SEAMA_MAGIC            0x5ea3a417
+#define WRGG03_MAGIC           0x20080321
 
 #if !defined(__BYTE_ORDER)
 #error "Unknown byte order"
@@ -61,9 +63,11 @@
 #if __BYTE_ORDER == __BIG_ENDIAN
 #define cpu_to_be32(x) (x)
 #define be32_to_cpu(x) (x)
+#define le32_to_cpu(x) bswap_32(x)
 #elif __BYTE_ORDER == __LITTLE_ENDIAN
 #define cpu_to_be32(x) bswap_32(x)
 #define be32_to_cpu(x) bswap_32(x)
+#define le32_to_cpu(x)  (x)
 #else
 #error "Unsupported endianness"
 #endif
@@ -72,6 +76,7 @@ enum mtd_image_format {
        MTD_IMAGE_FORMAT_UNKNOWN,
        MTD_IMAGE_FORMAT_TRX,
        MTD_IMAGE_FORMAT_SEAMA,
+       MTD_IMAGE_FORMAT_WRGG03,
 };
 
 static char *buf = NULL;
@@ -179,20 +184,29 @@ image_check(int imagefd, const char *mtd)
 {
        uint32_t magic;
        int ret = 1;
+       int bufread;
+
+       while (buflen < sizeof(magic)) {
+               bufread = read(imagefd, buf + buflen, sizeof(magic) - buflen);
+               if (bufread < 1)
+                       break;
+
+               buflen += bufread;
+       }
 
        if (buflen < sizeof(magic)) {
-               buflen += read(imagefd, buf + buflen, sizeof(magic) - buflen);
-               if (buflen < sizeof(magic)) {
-                       fprintf(stdout, "Could not get image magic\n");
-                       return 0;
-               }
+               fprintf(stdout, "Could not get image magic\n");
+               return 0;
        }
+
        magic = ((uint32_t *)buf)[0];
 
        if (be32_to_cpu(magic) == TRX_MAGIC)
                imageformat = MTD_IMAGE_FORMAT_TRX;
        else if (be32_to_cpu(magic) == SEAMA_MAGIC)
                imageformat = MTD_IMAGE_FORMAT_SEAMA;
+       else if (le32_to_cpu(magic) == WRGG03_MAGIC)
+               imageformat = MTD_IMAGE_FORMAT_WRGG03;
 
        switch (imageformat) {
        case MTD_IMAGE_FORMAT_TRX:
@@ -201,6 +215,8 @@ image_check(int imagefd, const char *mtd)
                break;
        case MTD_IMAGE_FORMAT_SEAMA:
                break;
+       case MTD_IMAGE_FORMAT_WRGG03:
+               break;
        default:
 #ifdef target_brcm
                if (!strcmp(mtd, "firmware"))
@@ -579,7 +595,7 @@ resume:
                                if (!quiet)
                                        fprintf(stderr, "\b\b\b   ");
                                if (quiet < 2)
-                                       fprintf(stderr, "\nAppending jffs2 data from %s to %s...", jffs2file, mtd);
+                                       fprintf(stderr, "\nAppending jffs2 data from %s to %s..\n.", jffs2file, mtd);
                                /* got an EOF marker - this is the place to add some jffs2 data */
                                skip = mtd_replace_jffs2(mtd, fd, e, jffs2file);
                                jffs2_replaced = 1;
@@ -667,7 +683,11 @@ resume:
                        break;
                case MTD_IMAGE_FORMAT_SEAMA:
                        if (mtd_fixseama)
-                               mtd_fixseama(mtd, 0);
+                               mtd_fixseama(mtd, 0, 0);
+                       break;
+               case MTD_IMAGE_FORMAT_WRGG03:
+                       if (mtd_fixwrgg)
+                               mtd_fixwrgg(mtd, 0, 0);
                        break;
                default:
                        break;
@@ -714,6 +734,10 @@ static void usage(void)
            fprintf(stderr,
        "        fixseama                fix the checksum in a seama header on first boot\n");
        }
+       if (mtd_fixwrgg) {
+           fprintf(stderr,
+       "        fixwrgg                 fix the checksum in a wrgg header on first boot\n");
+       }
        fprintf(stderr,
        "Following options are available:\n"
        "        -q                      quiet mode (once: no [w] on writing,\n"
@@ -725,12 +749,16 @@ static void usage(void)
        "        -d <name>               directory for jffs2write, defaults to \"tmp\"\n"
        "        -j <name>               integrate <file> into jffs2 data when writing an image\n"
        "        -s <number>             skip the first n bytes when appending data to the jffs2 partiton, defaults to \"0\"\n"
-       "        -p                      write beginning at partition offset\n"
+       "        -p <number>             write beginning at partition offset\n"
        "        -l <length>             the length of data that we want to dump\n");
        if (mtd_fixtrx) {
            fprintf(stderr,
        "        -o offset               offset of the image header in the partition(for fixtrx)\n");
        }
+       if (mtd_fixtrx || mtd_fixseama || mtd_fixwrgg) {
+               fprintf(stderr,
+       "        -c datasize             amount of data to be used for checksum calculation (for fixtrx / fixseama / fixwrgg)\n");
+       }
        fprintf(stderr,
 #ifdef FIS_SUPPORT
        "        -F <part>[:<size>[:<entrypoint>]][,<part>...]\n"
@@ -762,7 +790,7 @@ int main (int argc, char **argv)
        int ch, i, boot, imagefd = 0, force, unlocked;
        char *erase[MAX_ARGS], *device = NULL;
        char *fis_layout = NULL;
-       size_t offset = 0, part_offset = 0, dump_len = 0;
+       size_t offset = 0, data_size = 0, part_offset = 0, dump_len = 0;
        enum {
                CMD_ERASE,
                CMD_WRITE,
@@ -770,6 +798,7 @@ int main (int argc, char **argv)
                CMD_JFFS2WRITE,
                CMD_FIXTRX,
                CMD_FIXSEAMA,
+               CMD_FIXWRGG,
                CMD_VERIFY,
                CMD_DUMP,
                CMD_RESETBC,
@@ -786,7 +815,7 @@ int main (int argc, char **argv)
 #ifdef FIS_SUPPORT
                        "F:"
 #endif
-                       "frnqe:d:s:j:p:o:l:")) != -1)
+                       "frnqe:d:s:j:p:o:c:l:")) != -1)
                switch (ch) {
                        case 'f':
                                force = 1;
@@ -846,6 +875,14 @@ int main (int argc, char **argv)
                                        usage();
                                }
                                break;
+                       case 'c':
+                               errno = 0;
+                               data_size = strtoul(optarg, 0, 0);
+                               if (errno) {
+                                       fprintf(stderr, "-c: illegal numeric string\n");
+                                       usage();
+                               }
+                               break;
 #ifdef FIS_SUPPORT
                        case 'F':
                                fis_layout = optarg;
@@ -876,6 +913,9 @@ int main (int argc, char **argv)
        } else if (((strcmp(argv[0], "fixseama") == 0) && (argc == 2)) && mtd_fixseama) {
                cmd = CMD_FIXSEAMA;
                device = argv[1];
+       } else if (((strcmp(argv[0], "fixwrgg") == 0) && (argc == 2)) && mtd_fixwrgg) {
+               cmd = CMD_FIXWRGG;
+               device = argv[1];
        } else if ((strcmp(argv[0], "verify") == 0) && (argc == 3)) {
                cmd = CMD_VERIFY;
                imagefile = argv[1];
@@ -959,16 +999,22 @@ int main (int argc, char **argv)
                        mtd_write_jffs2(device, imagefile, jffs2dir);
                        break;
                case CMD_FIXTRX:
-                   if (mtd_fixtrx) {
-                           mtd_fixtrx(device, offset);
-            }
+                       if (mtd_fixtrx) {
+                               mtd_fixtrx(device, offset, data_size);
+                       }
+                       break;
                case CMD_RESETBC:
-                   if (mtd_resetbc) {
-                           mtd_resetbc(device);
-            }
+                       if (mtd_resetbc) {
+                               mtd_resetbc(device);
+                       }
+                       break;
                case CMD_FIXSEAMA:
                        if (mtd_fixseama)
-                           mtd_fixseama(device, 0);
+                               mtd_fixseama(device, 0, data_size);
+                       break;
+               case CMD_FIXWRGG:
+                       if (mtd_fixwrgg)
+                               mtd_fixwrgg(device, 0, data_size);
                        break;
        }