ar71xx: use the new om-watchdog package for OM2P

[openwrt.git] / tools / firmware-utils / src / mktplinkfw.c

diff --git a/tools/firmware-utils/src/mktplinkfw.c b/tools/firmware-utils/src/mktplinkfw.c
index b9caa0e..bc3a2f3 100644 (file)
--- a/tools/firmware-utils/src/mktplinkfw.c
+++ b/tools/firmware-utils/src/mktplinkfw.c
@@ -22,22 +22,28 @@
 #include <errno.h>
 #include <sys/stat.h>
 
 #include <errno.h>
 #include <sys/stat.h>
 

+#include <arpa/inet.h>
+#include <netinet/in.h>
+

 #include "md5.h"
 
 #include "md5.h"
 

-#if (__BYTE_ORDER == __BIG_ENDIAN)
-#  define HOST_TO_BE32(x)      (x)
-#  define BE32_TO_HOST(x)      (x)
-#else
-#  define HOST_TO_BE32(x)      bswap_32(x)
-#  define BE32_TO_HOST(x)      bswap_32(x)
-#endif
+#define ALIGN(x,a) ({ typeof(a) __a = (a); (((x) + __a - 1) & ~(__a - 1)); })

 
 #define HEADER_VERSION_V1      0x01000000
 
 #define HEADER_VERSION_V1      0x01000000

+#define HWID_TL_MR3220_V1      0x32200001
+#define HWID_TL_MR3420_V1      0x34200001

 #define HWID_TL_WA901ND_V1     0x09010001
 #define HWID_TL_WA901ND_V1     0x09010001

+#define HWID_TL_WA901ND_V2     0x09010002
+#define HWID_TL_WR703N_V1      0x07030101

 #define HWID_TL_WR741ND_V1     0x07410001
 #define HWID_TL_WR741ND_V1     0x07410001

+#define HWID_TL_WR741ND_V4     0x07410004
+#define HWID_TL_WR740N_V1      0x07400001
+#define HWID_TL_WR740N_V3      0x07400003
+#define HWID_TL_WR743ND_V1     0x07430001

 #define HWID_TL_WR841N_V1_5    0x08410002
 #define HWID_TL_WR841ND_V3     0x08410003
 #define HWID_TL_WR841ND_V5     0x08410005
 #define HWID_TL_WR841N_V1_5    0x08410002
 #define HWID_TL_WR841ND_V3     0x08410003
 #define HWID_TL_WR841ND_V5     0x08410005

+#define HWID_TL_WR841ND_V7     0x08410007

 #define HWID_TL_WR941ND_V2     0x09410002
 #define HWID_TL_WR941ND_V4     0x09410004
 #define HWID_TL_WR1043ND_V1    0x10430001
 #define HWID_TL_WR941ND_V2     0x09410002
 #define HWID_TL_WR941ND_V4     0x09410004
 #define HWID_TL_WR1043ND_V1    0x10430001


@@ -72,16 +78,21 @@ struct fw_header {
        uint8_t         pad[360];
 } __attribute__ ((packed));
 
        uint8_t         pad[360];
 } __attribute__ ((packed));
 

-struct board_info {
+struct flash_layout {

        char            *id;
        char            *id;

-       uint32_t        hw_id;
-       uint32_t        hw_rev;

        uint32_t        fw_max_len;
        uint32_t        kernel_la;
        uint32_t        kernel_ep;
        uint32_t        rootfs_ofs;
 };
 
        uint32_t        fw_max_len;
        uint32_t        kernel_la;
        uint32_t        kernel_ep;
        uint32_t        rootfs_ofs;
 };
 

+struct board_info {
+       char            *id;
+       uint32_t        hw_id;
+       uint32_t        hw_rev;
+       char            *layout_id;
+};
+

 /*
  * Globals
  */
 /*
  * Globals
  */


@@ -92,14 +103,24 @@ static char *version = "ver. 1.0";
 
 static char *board_id;
 static struct board_info *board;
 
 static char *board_id;
 static struct board_info *board;

+static char *layout_id;
+static struct flash_layout *layout;
+static char *opt_hw_id;
+static uint32_t hw_id;
+static char *opt_hw_rev;
+static uint32_t hw_rev;

 static struct file_info kernel_info;
 static uint32_t kernel_la = 0;
 static uint32_t kernel_ep = 0;
 static struct file_info kernel_info;
 static uint32_t kernel_la = 0;
 static uint32_t kernel_ep = 0;

+static uint32_t kernel_len = 0;

 static struct file_info rootfs_info;
 static uint32_t rootfs_ofs = 0;
 static struct file_info rootfs_info;
 static uint32_t rootfs_ofs = 0;

+static uint32_t rootfs_align;

 static struct file_info boot_info;
 static int combined;
 static int strip_padding;
 static struct file_info boot_info;
 static int combined;
 static int strip_padding;

+static int add_jffs2_eof;
+static unsigned char jffs2_eof_mark[4] = {0xde, 0xad, 0xc0, 0xde};

 
 static struct file_info inspect_info;
 static int extract = 0;
 
 static struct file_info inspect_info;
 static int extract = 0;


@@ -114,71 +135,116 @@ char md5salt_boot[MD5SUM_LEN] = {
        0xa7, 0x9c, 0x28, 0xda, 0xb2, 0xe9, 0x0f, 0x42,
 };
 
        0xa7, 0x9c, 0x28, 0xda, 0xb2, 0xe9, 0x0f, 0x42,
 };
 

-static struct board_info boards[] = {
+static struct flash_layout layouts[] = {

        {
        {

-               .id             = "TL-WA901NDv1",
-               .hw_id          = HWID_TL_WA901ND_V1,
-               .hw_rev         = 1,
+               .id             = "4M",

                .fw_max_len     = 0x3c0000,
                .kernel_la      = 0x80060000,
                .kernel_ep      = 0x80060000,
                .rootfs_ofs     = 0x140000,
        }, {
                .fw_max_len     = 0x3c0000,
                .kernel_la      = 0x80060000,
                .kernel_ep      = 0x80060000,
                .rootfs_ofs     = 0x140000,
        }, {

-               .id             = "TL-WR741NDv1",
-               .hw_id          = HWID_TL_WR741ND_V1,
-               .hw_rev         = 1,
+               .id             = "4Mlzma",

                .fw_max_len     = 0x3c0000,
                .kernel_la      = 0x80060000,
                .kernel_ep      = 0x80060000,
                .fw_max_len     = 0x3c0000,
                .kernel_la      = 0x80060000,
                .kernel_ep      = 0x80060000,

+               .rootfs_ofs     = 0x100000,
+       }, {
+               .id             = "8M",
+               .fw_max_len     = 0x7c0000,
+               .kernel_la      = 0x80060000,
+               .kernel_ep      = 0x80060000,

                .rootfs_ofs     = 0x140000,
                .rootfs_ofs     = 0x140000,

+       }, {
+               /* terminating entry */
+       }
+};
+
+static struct board_info boards[] = {
+       {
+               .id             = "TL-MR3220v1",
+               .hw_id          = HWID_TL_MR3220_V1,
+               .hw_rev         = 1,
+               .layout_id      = "4M",
+       }, {
+               .id             = "TL-MR3420v1",
+               .hw_id          = HWID_TL_MR3420_V1,
+               .hw_rev         = 1,
+               .layout_id      = "4M",
+       }, {
+               .id             = "TL-WA901NDv1",
+               .hw_id          = HWID_TL_WA901ND_V1,
+               .hw_rev         = 1,
+               .layout_id      = "4M",
+       }, {
+               .id             = "TL-WA901NDv2",
+               .hw_id          = HWID_TL_WA901ND_V2,
+               .hw_rev         = 1,
+               .layout_id      = "4M",
+       }, {
+               .id             = "TL-WR741NDv1",
+               .hw_id          = HWID_TL_WR741ND_V1,
+               .hw_rev         = 1,
+               .layout_id      = "4M",
+       }, {
+               .id             = "TL-WR741NDv4",
+               .hw_id          = HWID_TL_WR741ND_V4,
+               .hw_rev         = 1,
+               .layout_id      = "4Mlzma",
+       }, {
+               .id             = "TL-WR740Nv1",
+               .hw_id          = HWID_TL_WR740N_V1,
+               .hw_rev         = 1,
+               .layout_id      = "4M",
+       }, {
+               .id             = "TL-WR740Nv3",
+               .hw_id          = HWID_TL_WR740N_V3,
+               .hw_rev         = 1,
+               .layout_id      = "4M",
+       }, {
+               .id             = "TL-WR743NDv1",
+               .hw_id          = HWID_TL_WR743ND_V1,
+               .hw_rev         = 1,
+               .layout_id      = "4M",

        }, {
                .id             = "TL-WR841Nv1.5",
                .hw_id          = HWID_TL_WR841N_V1_5,
                .hw_rev         = 2,
        }, {
                .id             = "TL-WR841Nv1.5",
                .hw_id          = HWID_TL_WR841N_V1_5,
                .hw_rev         = 2,

-               .fw_max_len     = 0x3c0000,
-               .kernel_la      = 0x80060000,
-               .kernel_ep      = 0x80060000,
-               .rootfs_ofs     = 0x140000,
+               .layout_id      = "4M",

        }, {
                .id             = "TL-WR841NDv3",
                .hw_id          = HWID_TL_WR841ND_V3,
                .hw_rev         = 3,
        }, {
                .id             = "TL-WR841NDv3",
                .hw_id          = HWID_TL_WR841ND_V3,
                .hw_rev         = 3,

-               .fw_max_len     = 0x3c0000,
-               .kernel_la      = 0x80060000,
-               .kernel_ep      = 0x80060000,
-               .rootfs_ofs     = 0x140000,
+               .layout_id      = "4M",

        }, {
                .id             = "TL-WR841NDv5",
                .hw_id          = HWID_TL_WR841ND_V5,
                .hw_rev         = 1,
        }, {
                .id             = "TL-WR841NDv5",
                .hw_id          = HWID_TL_WR841ND_V5,
                .hw_rev         = 1,

-               .fw_max_len     = 0x3c0000,
-               .kernel_la      = 0x80060000,
-               .kernel_ep      = 0x80060000,
-               .rootfs_ofs     = 0x140000,
+               .layout_id      = "4M",
+       }, {
+               .id             = "TL-WR841NDv7",
+               .hw_id          = HWID_TL_WR841ND_V7,
+               .hw_rev         = 1,
+               .layout_id      = "4M",

        }, {
                .id             = "TL-WR941NDv2",
                .hw_id          = HWID_TL_WR941ND_V2,
                .hw_rev         = 2,
        }, {
                .id             = "TL-WR941NDv2",
                .hw_id          = HWID_TL_WR941ND_V2,
                .hw_rev         = 2,

-               .fw_max_len     = 0x3c0000,
-               .kernel_la      = 0x80060000,
-               .kernel_ep      = 0x80060000,
-               .rootfs_ofs     = 0x140000,
+               .layout_id      = "4M",

        }, {
                .id             = "TL-WR941NDv4",
                .hw_id          = HWID_TL_WR941ND_V4,
                .hw_rev         = 1,
        }, {
                .id             = "TL-WR941NDv4",
                .hw_id          = HWID_TL_WR941ND_V4,
                .hw_rev         = 1,

-               .fw_max_len     = 0x3c0000,
-               .kernel_la      = 0x80060000,
-               .kernel_ep      = 0x80060000,
-               .rootfs_ofs     = 0x140000,
+               .layout_id      = "4M",

        }, {
                .id             = "TL-WR1043NDv1",
                .hw_id          = HWID_TL_WR1043ND_V1,
                .hw_rev         = 1,
        }, {
                .id             = "TL-WR1043NDv1",
                .hw_id          = HWID_TL_WR1043ND_V1,
                .hw_rev         = 1,

-               .fw_max_len     = 0x7c0000,
-               .kernel_la      = 0x80060000,
-               .kernel_ep      = 0x80060000,
-               .rootfs_ofs     = 0x140000,
+               .layout_id      = "8M",
+       }, {
+               .id             = "TL-WR703Nv1",
+               .hw_id          = HWID_TL_WR703N_V1,
+               .hw_rev         = 1,
+               .layout_id      = "4Mlzma",

        }, {
                /* terminating entry */
        }
        }, {
                /* terminating entry */
        }


@@ -232,6 +298,21 @@ static struct board_info *find_board_by_hwid(uint32_t hw_id)
        return NULL;
 }
 
        return NULL;
 }
 

+static struct flash_layout *find_layout(char *id)
+{
+       struct flash_layout *ret;
+       struct flash_layout *l;
+
+       ret = NULL;
+       for (l = layouts; l->id != NULL; l++){
+               if (strcasecmp(id, l->id) == 0) {
+                       ret = l;
+                       break;
+               }
+       };
+
+       return ret;
+}

 
 static void usage(int status)
 {
 
 static void usage(int status)
 {


@@ -246,11 +327,15 @@ static void usage(int status)
 "  -c              use combined kernel image\n"
 "  -E <ep>         overwrite kernel entry point with <ep> (hexval prefixed with 0x)\n"
 "  -L <la>         overwrite kernel load address with <la> (hexval prefixed with 0x)\n"
 "  -c              use combined kernel image\n"
 "  -E <ep>         overwrite kernel entry point with <ep> (hexval prefixed with 0x)\n"
 "  -L <la>         overwrite kernel load address with <la> (hexval prefixed with 0x)\n"

+"  -H <hwid>       use hardware id specified with <hwid>\n"
+"  -F <id>         use flash layout specified with <id>\n"

 "  -k <file>       read kernel image from the file <file>\n"
 "  -r <file>       read rootfs image from the file <file>\n"
 "  -k <file>       read kernel image from the file <file>\n"
 "  -r <file>       read rootfs image from the file <file>\n"

+"  -a <align>      align the rootfs start on an <align> bytes boundary\n"

 "  -R <offset>     overwrite rootfs offset with <offset> (hexval prefixed with 0x)\n"
 "  -o <file>       write output to the file <file>\n"
 "  -s              strip padding from the end of the image\n"
 "  -R <offset>     overwrite rootfs offset with <offset> (hexval prefixed with 0x)\n"
 "  -o <file>       write output to the file <file>\n"
 "  -s              strip padding from the end of the image\n"

+"  -j              add jffs2 end-of-filesystem markers\n"

 "  -N <vendor>     set image vendor to <vendor>\n"
 "  -V <version>    set image version to <version>\n"
 "  -i <file>       inspect given firmware file <file>\n"
 "  -N <vendor>     set image vendor to <vendor>\n"
 "  -V <version>    set image version to <version>\n"
 "  -i <file>       inspect given firmware file <file>\n"


@@ -329,22 +414,47 @@ static int check_options(void)
                return -1;
        }
 
                return -1;
        }
 

-       if (board_id == NULL) {
-               ERR("no board specified");
+       if (board_id == NULL && opt_hw_id == NULL) {
+               ERR("either board or hardware id must be specified");

                return -1;
        }
 
                return -1;
        }
 

-       board = find_board(board_id);
-       if (board == NULL) {
-               ERR("unknown/unsupported board id \"%s\"", board_id);
+       if (board_id) {
+               board = find_board(board_id);
+               if (board == NULL) {
+                       ERR("unknown/unsupported board id \"%s\"", board_id);
+                       return -1;
+               }
+               if (layout_id == NULL)
+                       layout_id = board->layout_id;
+
+               hw_id = board->hw_id;
+               hw_rev = board->hw_rev;
+       } else {
+               if (layout_id == NULL) {
+                       ERR("flash layout is not specified");
+                       return -1;
+               }
+               hw_id = strtoul(opt_hw_id, NULL, 0);
+
+               if (opt_hw_rev)
+                       hw_rev = strtoul(opt_hw_rev, NULL, 0);
+               else
+                       hw_rev = 1;
+       }
+
+       layout = find_layout(layout_id);
+       if (layout == NULL) {
+               ERR("unknown flash layout \"%s\"", layout_id);

                return -1;
        }
                return -1;
        }

+

        if (!kernel_la)
        if (!kernel_la)

-               kernel_la = board->kernel_la;
+               kernel_la = layout->kernel_la;

        if (!kernel_ep)
        if (!kernel_ep)

-               kernel_ep = board->kernel_ep;
+               kernel_ep = layout->kernel_ep;

        if (!rootfs_ofs)
        if (!rootfs_ofs)

-               rootfs_ofs = board->rootfs_ofs;
+               rootfs_ofs = layout->rootfs_ofs;

 
        if (kernel_info.file_name == NULL) {
                ERR("no kernel image specified");
 
        if (kernel_info.file_name == NULL) {
                ERR("no kernel image specified");


@@ -355,18 +465,15 @@ static int check_options(void)
        if (ret)
                return ret;
 
        if (ret)
                return ret;
 

+       kernel_len = kernel_info.file_size;
+

        if (combined) {
                if (kernel_info.file_size >
        if (combined) {
                if (kernel_info.file_size >

-                   board->fw_max_len - sizeof(struct fw_header)) {
+                   layout->fw_max_len - sizeof(struct fw_header)) {

                        ERR("kernel image is too big");
                        return -1;
                }
        } else {
                        ERR("kernel image is too big");
                        return -1;
                }
        } else {

-               if (kernel_info.file_size >
-                   rootfs_ofs - sizeof(struct fw_header)) {
-                       ERR("kernel image is too big");
-                       return -1;
-               }

                if (rootfs_info.file_name == NULL) {
                        ERR("no rootfs image specified");
                        return -1;
                if (rootfs_info.file_name == NULL) {
                        ERR("no rootfs image specified");
                        return -1;


@@ -376,10 +483,30 @@ static int check_options(void)
                if (ret)
                        return ret;
 
                if (ret)
                        return ret;
 

-               if (rootfs_info.file_size >
-                    (board->fw_max_len - rootfs_ofs)) {
-                       ERR("rootfs image is too big");
-                       return -1;
+               if (rootfs_align) {
+                       kernel_len += sizeof(struct fw_header);
+                       kernel_len = ALIGN(kernel_len, rootfs_align);
+                       kernel_len -= sizeof(struct fw_header);
+
+                       DBG("kernel length aligned to %u", kernel_len);
+
+                       if (kernel_len + rootfs_info.file_size >
+                           layout->fw_max_len - sizeof(struct fw_header)) {
+                               ERR("images are too big");
+                               return -1;
+                       }
+               } else {
+                       if (kernel_info.file_size >
+                           rootfs_ofs - sizeof(struct fw_header)) {
+                               ERR("kernel image is too big");
+                               return -1;
+                       }
+
+                       if (rootfs_info.file_size >
+                           (layout->fw_max_len - rootfs_ofs)) {
+                               ERR("rootfs image is too big");
+                               return -1;
+                       }

                }
        }
 
                }
        }
 


@@ -397,30 +524,64 @@ static void fill_header(char *buf, int len)
 
        memset(hdr, 0, sizeof(struct fw_header));
 
 
        memset(hdr, 0, sizeof(struct fw_header));
 

-       hdr->version = HOST_TO_BE32(HEADER_VERSION_V1);
+       hdr->version = htonl(HEADER_VERSION_V1);

        strncpy(hdr->vendor_name, vendor, sizeof(hdr->vendor_name));
        strncpy(hdr->fw_version, version, sizeof(hdr->fw_version));
        strncpy(hdr->vendor_name, vendor, sizeof(hdr->vendor_name));
        strncpy(hdr->fw_version, version, sizeof(hdr->fw_version));

-       hdr->hw_id = HOST_TO_BE32(board->hw_id);
-       hdr->hw_rev = HOST_TO_BE32(board->hw_rev);
+       hdr->hw_id = htonl(hw_id);
+       hdr->hw_rev = htonl(hw_rev);

 
        if (boot_info.file_size == 0)
                memcpy(hdr->md5sum1, md5salt_normal, sizeof(hdr->md5sum1));
        else
                memcpy(hdr->md5sum1, md5salt_boot, sizeof(hdr->md5sum1));
 
 
        if (boot_info.file_size == 0)
                memcpy(hdr->md5sum1, md5salt_normal, sizeof(hdr->md5sum1));
        else
                memcpy(hdr->md5sum1, md5salt_boot, sizeof(hdr->md5sum1));
 

-       hdr->kernel_la = HOST_TO_BE32(kernel_la);
-       hdr->kernel_ep = HOST_TO_BE32(kernel_ep);
-       hdr->fw_length = HOST_TO_BE32(board->fw_max_len);
-       hdr->kernel_ofs = HOST_TO_BE32(sizeof(struct fw_header));
-       hdr->kernel_len = HOST_TO_BE32(kernel_info.file_size);
+       hdr->kernel_la = htonl(kernel_la);
+       hdr->kernel_ep = htonl(kernel_ep);
+       hdr->fw_length = htonl(layout->fw_max_len);
+       hdr->kernel_ofs = htonl(sizeof(struct fw_header));
+       hdr->kernel_len = htonl(kernel_len);

        if (!combined) {
        if (!combined) {

-               hdr->rootfs_ofs = HOST_TO_BE32(rootfs_ofs);
-               hdr->rootfs_len = HOST_TO_BE32(rootfs_info.file_size);
+               hdr->rootfs_ofs = htonl(rootfs_ofs);
+               hdr->rootfs_len = htonl(rootfs_info.file_size);

        }
 
        get_md5(buf, len, hdr->md5sum1);
 }
 
        }
 
        get_md5(buf, len, hdr->md5sum1);
 }
 

+static int pad_jffs2(char *buf, int currlen)
+{
+       int len;
+       uint32_t pad_mask;
+
+       len = currlen;
+       pad_mask = (64 * 1024);
+       while ((len < layout->fw_max_len) && (pad_mask != 0)) {
+               uint32_t mask;
+               int i;
+
+               for (i = 10; i < 32; i++) {
+                       mask = 1 << i;
+                       if (pad_mask & mask)
+                               break;
+               }
+
+               len = ALIGN(len, mask);
+
+               for (i = 10; i < 32; i++) {
+                       mask = 1 << i;
+                       if ((len & (mask - 1)) == 0)
+                               pad_mask &= ~mask;
+               }
+
+               for (i = 0; i < sizeof(jffs2_eof_mark); i++)
+                       buf[len + i] = jffs2_eof_mark[i];
+
+               len += sizeof(jffs2_eof_mark);
+       }
+
+       return len;
+}
+

 static int write_fw(char *data, int len)
 {
        FILE *f;
 static int write_fw(char *data, int len)
 {
        FILE *f;


@@ -461,7 +622,7 @@ static int build_fw(void)
        int ret = EXIT_FAILURE;
        int writelen = 0;
 
        int ret = EXIT_FAILURE;
        int writelen = 0;
 

-       buflen = board->fw_max_len;
+       buflen = layout->fw_max_len;

 
        buf = malloc(buflen);
        if (!buf) {
 
        buf = malloc(buflen);
        if (!buf) {


@@ -475,15 +636,25 @@ static int build_fw(void)
        if (ret)
                goto out_free_buf;
 
        if (ret)
                goto out_free_buf;
 

-       writelen = kernel_info.file_size;
+       writelen = sizeof(struct fw_header) + kernel_len;

 
        if (!combined) {
 
        if (!combined) {

-               p = buf + rootfs_ofs;
+               if (rootfs_align)
+                       p = buf + writelen;
+               else
+                       p = buf + rootfs_ofs;
+

                ret = read_to_buf(&rootfs_info, p);
                if (ret)
                        goto out_free_buf;
 
                ret = read_to_buf(&rootfs_info, p);
                if (ret)
                        goto out_free_buf;
 

-               writelen = rootfs_ofs + rootfs_info.file_size;
+               if (rootfs_align)
+                       writelen += rootfs_info.file_size;
+               else
+                       writelen = rootfs_ofs + rootfs_info.file_size;
+
+               if (add_jffs2_eof)
+                       writelen = pad_jffs2(buf, writelen);

        }
 
        if (!strip_padding)
        }
 
        if (!strip_padding)


@@ -589,18 +760,18 @@ static int inspect_fw(void)
        inspect_fw_pstr("File name", inspect_info.file_name);
        inspect_fw_phexdec("File size", inspect_info.file_size);
 
        inspect_fw_pstr("File name", inspect_info.file_name);
        inspect_fw_phexdec("File size", inspect_info.file_size);
 

-       if (BE32_TO_HOST(hdr->version) != HEADER_VERSION_V1) {
+       if (ntohl(hdr->version) != HEADER_VERSION_V1) {

                ERR("file does not seem to have V1 header!\n");
                goto out_free_buf;
        }
 
        inspect_fw_phexdec("Version 1 Header size", sizeof(struct fw_header));
 
                ERR("file does not seem to have V1 header!\n");
                goto out_free_buf;
        }
 
        inspect_fw_phexdec("Version 1 Header size", sizeof(struct fw_header));
 

-       if (BE32_TO_HOST(hdr->unk1) != 0)
+       if (ntohl(hdr->unk1) != 0)

                inspect_fw_phexdec("Unknown value 1", hdr->unk1);
 
        memcpy(md5sum, hdr->md5sum1, sizeof(md5sum));
                inspect_fw_phexdec("Unknown value 1", hdr->unk1);
 
        memcpy(md5sum, hdr->md5sum1, sizeof(md5sum));

-       if (BE32_TO_HOST(hdr->boot_len) == 0)
+       if (ntohl(hdr->boot_len) == 0)

                memcpy(hdr->md5sum1, md5salt_normal, sizeof(md5sum));
        else
                memcpy(hdr->md5sum1, md5salt_boot, sizeof(md5sum));
                memcpy(hdr->md5sum1, md5salt_normal, sizeof(md5sum));
        else
                memcpy(hdr->md5sum1, md5salt_boot, sizeof(md5sum));


@@ -612,62 +783,63 @@ static int inspect_fw(void)
        } else {
                inspect_fw_pmd5sum("Header MD5Sum1", md5sum, "(ok)");
        }
        } else {
                inspect_fw_pmd5sum("Header MD5Sum1", md5sum, "(ok)");
        }

-       if (BE32_TO_HOST(hdr->unk2) != 0)
+       if (ntohl(hdr->unk2) != 0)

                inspect_fw_phexdec("Unknown value 2", hdr->unk2);
        inspect_fw_pmd5sum("Header MD5Sum2", hdr->md5sum2,
                           "(purpose yet unknown, unchecked here)");
                inspect_fw_phexdec("Unknown value 2", hdr->unk2);
        inspect_fw_pmd5sum("Header MD5Sum2", hdr->md5sum2,
                           "(purpose yet unknown, unchecked here)");

-       if (BE32_TO_HOST(hdr->unk3) != 0)
+       if (ntohl(hdr->unk3) != 0)

                inspect_fw_phexdec("Unknown value 3", hdr->unk3);
 
        printf("\n");
 
        inspect_fw_pstr("Vendor name", hdr->vendor_name);
        inspect_fw_pstr("Firmware version", hdr->fw_version);
                inspect_fw_phexdec("Unknown value 3", hdr->unk3);
 
        printf("\n");
 
        inspect_fw_pstr("Vendor name", hdr->vendor_name);
        inspect_fw_pstr("Firmware version", hdr->fw_version);

-       board = find_board_by_hwid(BE32_TO_HOST(hdr->hw_id));
+       board = find_board_by_hwid(ntohl(hdr->hw_id));

        if (board) {
        if (board) {

+               layout = find_layout(board->layout_id);

                inspect_fw_phexpost("Hardware ID",
                inspect_fw_phexpost("Hardware ID",

-                                   BE32_TO_HOST(hdr->hw_id), board->id);
+                                   ntohl(hdr->hw_id), board->id);

                inspect_fw_phexexp("Hardware Revision",
                inspect_fw_phexexp("Hardware Revision",

-                                  BE32_TO_HOST(hdr->hw_rev), board->hw_rev);
+                                  ntohl(hdr->hw_rev), board->hw_rev);

        } else {
                inspect_fw_phexpost("Hardware ID",
        } else {
                inspect_fw_phexpost("Hardware ID",

-                                   BE32_TO_HOST(hdr->hw_id), "unknown");
+                                   ntohl(hdr->hw_id), "unknown");

                inspect_fw_phex("Hardware Revision",
                inspect_fw_phex("Hardware Revision",

-                               BE32_TO_HOST(hdr->hw_rev));
+                               ntohl(hdr->hw_rev));

        }
 
        printf("\n");
 
        inspect_fw_phexdec("Kernel data offset",
        }
 
        printf("\n");
 
        inspect_fw_phexdec("Kernel data offset",

-                          BE32_TO_HOST(hdr->kernel_ofs));
+                          ntohl(hdr->kernel_ofs));

        inspect_fw_phexdec("Kernel data length",
        inspect_fw_phexdec("Kernel data length",

-                          BE32_TO_HOST(hdr->kernel_len));
+                          ntohl(hdr->kernel_len));

        if (board) {
                inspect_fw_phexdef("Kernel load address",
        if (board) {
                inspect_fw_phexdef("Kernel load address",

-                                  BE32_TO_HOST(hdr->kernel_la),
-                                  board->kernel_la);
+                                  ntohl(hdr->kernel_la),
+                                  layout ? layout->kernel_la : 0xffffffff);

                inspect_fw_phexdef("Kernel entry point",
                inspect_fw_phexdef("Kernel entry point",

-                                  BE32_TO_HOST(hdr->kernel_ep),
-                                  board->kernel_ep);
+                                  ntohl(hdr->kernel_ep),
+                                  layout ? layout->kernel_ep : 0xffffffff);

                inspect_fw_phexdecdef("Rootfs data offset",
                inspect_fw_phexdecdef("Rootfs data offset",

-                                     BE32_TO_HOST(hdr->rootfs_ofs),
-                                     board->rootfs_ofs);
+                                     ntohl(hdr->rootfs_ofs),
+                                     layout ? layout->rootfs_ofs : 0xffffffff);

        } else {
                inspect_fw_phex("Kernel load address",
        } else {
                inspect_fw_phex("Kernel load address",

-                               BE32_TO_HOST(hdr->kernel_la));
+                               ntohl(hdr->kernel_la));

                inspect_fw_phex("Kernel entry point",
                inspect_fw_phex("Kernel entry point",

-                               BE32_TO_HOST(hdr->kernel_ep));
+                               ntohl(hdr->kernel_ep));

                inspect_fw_phexdec("Rootfs data offset",
                inspect_fw_phexdec("Rootfs data offset",

-                                  BE32_TO_HOST(hdr->rootfs_ofs));
+                                  ntohl(hdr->rootfs_ofs));

        }
        inspect_fw_phexdec("Rootfs data length",
        }
        inspect_fw_phexdec("Rootfs data length",

-                          BE32_TO_HOST(hdr->rootfs_len));
+                          ntohl(hdr->rootfs_len));

        inspect_fw_phexdec("Boot loader data offset",
        inspect_fw_phexdec("Boot loader data offset",

-                          BE32_TO_HOST(hdr->boot_ofs));
+                          ntohl(hdr->boot_ofs));

        inspect_fw_phexdec("Boot loader data length",
        inspect_fw_phexdec("Boot loader data length",

-                          BE32_TO_HOST(hdr->boot_len));
+                          ntohl(hdr->boot_len));

        inspect_fw_phexdec("Total firmware length",
        inspect_fw_phexdec("Total firmware length",

-                          BE32_TO_HOST(hdr->fw_length));
+                          ntohl(hdr->fw_length));

 
        if (extract) {
                FILE *fp;
 
        if (extract) {
                FILE *fp;


@@ -680,8 +852,8 @@ static int inspect_fw(void)
                printf("Extracting kernel to \"%s\"...\n", filename);
                fp = fopen(filename, "w");
                if (fp) {
                printf("Extracting kernel to \"%s\"...\n", filename);
                fp = fopen(filename, "w");
                if (fp) {

-                       if (!fwrite(buf + BE32_TO_HOST(hdr->kernel_ofs),
-                                   BE32_TO_HOST(hdr->kernel_len), 1, fp)) {
+                       if (!fwrite(buf + ntohl(hdr->kernel_ofs),
+                                   ntohl(hdr->kernel_len), 1, fp)) {

                                ERR("error in fwrite(): %s", strerror(errno));
                        }
                        fclose(fp);
                                ERR("error in fwrite(): %s", strerror(errno));
                        }
                        fclose(fp);


@@ -695,8 +867,8 @@ static int inspect_fw(void)
                printf("Extracting rootfs to \"%s\"...\n", filename);
                fp = fopen(filename, "w");
                if (fp) {
                printf("Extracting rootfs to \"%s\"...\n", filename);
                fp = fopen(filename, "w");
                if (fp) {

-                       if (!fwrite(buf + BE32_TO_HOST(hdr->rootfs_ofs),
-                                   BE32_TO_HOST(hdr->rootfs_len), 1, fp)) {
+                       if (!fwrite(buf + ntohl(hdr->rootfs_ofs),
+                                   ntohl(hdr->rootfs_len), 1, fp)) {

                                ERR("error in fwrite(): %s", strerror(errno));
                        }
                        fclose(fp);
                                ERR("error in fwrite(): %s", strerror(errno));
                        }
                        fclose(fp);


@@ -724,17 +896,29 @@ int main(int argc, char *argv[])
        while ( 1 ) {
                int c;
 
        while ( 1 ) {
                int c;
 

-               c = getopt(argc, argv, "B:E:L:V:N:ci:k:r:R:o:xhs");
+               c = getopt(argc, argv, "a:B:H:E:F:L:V:N:W:ci:k:r:R:o:xhsj");

                if (c == -1)
                        break;
 
                switch (c) {
                if (c == -1)
                        break;
 
                switch (c) {

+               case 'a':
+                       sscanf(optarg, "0x%x", &rootfs_align);
+                       break;

                case 'B':
                        board_id = optarg;
                        break;
                case 'B':
                        board_id = optarg;
                        break;

+               case 'H':
+                       opt_hw_id = optarg;
+                       break;

                case 'E':
                        sscanf(optarg, "0x%x", &kernel_ep);
                        break;
                case 'E':
                        sscanf(optarg, "0x%x", &kernel_ep);
                        break;

+               case 'F':
+                       layout_id = optarg;
+                       break;
+               case 'W':
+                       opt_hw_rev = optarg;
+                       break;

                case 'L':
                        sscanf(optarg, "0x%x", &kernel_la);
                        break;
                case 'L':
                        sscanf(optarg, "0x%x", &kernel_la);
                        break;


@@ -765,6 +949,9 @@ int main(int argc, char *argv[])
                case 'i':
                        inspect_info.file_name = optarg;
                        break;
                case 'i':
                        inspect_info.file_name = optarg;
                        break;

+               case 'j':
+                       add_jffs2_eof = 1;
+                       break;

                case 'x':
                        extract = 1;
                        break;
                case 'x':
                        extract = 1;
                        break;