rpcd: iwinfo plugin fixes
[openwrt.git] / tools / firmware-utils / src / mktplinkfw.c
index d15ca5b..7127932 100644 (file)
 #include "md5.h"
 
 #define ALIGN(x,a) ({ typeof(a) __a = (a); (((x) + __a - 1) & ~(__a - 1)); })
+#define ARRAY_SIZE(a) (sizeof((a)) / sizeof((a)[0]))
 
 #define HEADER_VERSION_V1      0x01000000
-#define HWID_TL_MR10U_V1       0x00100101
-#define HWID_TL_MR13U_V1       0x00130101
-#define HWID_TL_MR3020_V1      0x30200001
-#define HWID_TL_MR3220_V1      0x32200001
-#define HWID_TL_MR3220_V2      0x32200002
-#define HWID_TL_MR3420_V1      0x34200001
-#define HWID_TL_MR3420_V2      0x34200002
-#define HWID_TL_WA701N_V1      0x07010001
-#define HWID_TL_WA7510N_V1     0x75100001
-#define HWID_TL_WA801ND_V1     0x08010001
-#define HWID_TL_WA830RE_V1     0x08300010
-#define HWID_TL_WA830RE_V2     0x08300002
-#define HWID_TL_WA801ND_V2     0x08010002
-#define HWID_TL_WA901ND_V1     0x09010001
-#define HWID_TL_WA901ND_V2     0x09010002
-#define HWID_TL_WDR4900_V1     0x49000001
-#define HWID_TL_WR703N_V1      0x07030101
-#define HWID_TL_WR720N_V3      0x07200103
-#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_WR743ND_V2     0x07430002
-#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_WR1043ND_V2    0x10430002
-#define HWID_TL_WR1041N_V2     0x10410002
-#define HWID_TL_WR2543N_V1     0x25430001
+#define HEADER_VERSION_V2      0x02000000
 
 #define MD5SUM_LEN     16
 
@@ -78,7 +46,7 @@ struct fw_header {
        char            fw_version[36];
        uint32_t        hw_id;          /* hardware id */
        uint32_t        hw_rev;         /* hardware revision */
-       uint32_t        unk1;
+       uint32_t        region;         /* region code */
        uint8_t         md5sum1[MD5SUM_LEN];
        uint32_t        unk2;
        uint8_t         md5sum2[MD5SUM_LEN];
@@ -106,13 +74,6 @@ struct flash_layout {
        uint32_t        rootfs_ofs;
 };
 
-struct board_info {
-       char            *id;
-       uint32_t        hw_id;
-       uint32_t        hw_rev;
-       char            *layout_id;
-};
-
 /*
  * Globals
  */
@@ -121,15 +82,17 @@ static char *progname;
 static char *vendor = "TP-LINK Technologies";
 static char *version = "ver. 1.0";
 static char *fw_ver = "0.0.0";
+static uint32_t hdr_ver = HEADER_VERSION_V1;
 
-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 uint32_t opt_hdr_ver = 1;
+static char *country;
+static uint32_t region;
 static int fw_ver_lo;
 static int fw_ver_mid;
 static int fw_ver_hi;
@@ -143,6 +106,7 @@ static uint32_t rootfs_align;
 static struct file_info boot_info;
 static int combined;
 static int strip_padding;
+static int ignore_size;
 static int add_jffs2_eof;
 static unsigned char jffs2_eof_mark[4] = {0xde, 0xad, 0xc0, 0xde};
 static uint32_t fw_max_len;
@@ -151,12 +115,12 @@ static uint32_t reserved_space;
 static struct file_info inspect_info;
 static int extract = 0;
 
-char md5salt_normal[MD5SUM_LEN] = {
+static const char md5salt_normal[MD5SUM_LEN] = {
        0xdc, 0xd7, 0x3a, 0xa5, 0xc3, 0x95, 0x98, 0xfb,
        0xdd, 0xf9, 0xe7, 0xf4, 0x0e, 0xae, 0x47, 0x38,
 };
 
-char md5salt_boot[MD5SUM_LEN] = {
+static const char md5salt_boot[MD5SUM_LEN] = {
        0x8c, 0xef, 0x33, 0x5b, 0xd5, 0xc5, 0xce, 0xfa,
        0xa7, 0x9c, 0x28, 0xda, 0xb2, 0xe9, 0x0f, 0x42,
 };
@@ -187,9 +151,21 @@ static struct flash_layout layouts[] = {
                .kernel_ep      = 0x80060000,
                .rootfs_ofs     = 0x100000,
        }, {
+               .id             = "16M",
+               .fw_max_len     = 0xf80000,
+               .kernel_la      = 0x80060000,
+               .kernel_ep      = 0x80060000,
+               .rootfs_ofs     = 0x140000,
+       }, {
+               .id             = "16Mlzma",
+               .fw_max_len     = 0xf80000,
+               .kernel_la      = 0x80060000,
+               .kernel_ep      = 0x80060000,
+               .rootfs_ofs     = 0x100000,
+       }, {
                .id             = "16Mppc",
                .fw_max_len     = 0xf80000,
-               .kernel_la      = 0x00000000,
+               .kernel_la      = 0x00000000 ,
                .kernel_ep      = 0xc0000000,
                .rootfs_ofs     = 0x2a0000,
        }, {
@@ -197,180 +173,9 @@ static struct flash_layout layouts[] = {
        }
 };
 
-static struct board_info boards[] = {
-       {
-               .id             = "TL-MR10Uv1",
-               .hw_id          = HWID_TL_MR10U_V1,
-               .hw_rev         = 1,
-               .layout_id      = "4Mlzma",
-       }, {
-               .id             = "TL-MR13Uv1",
-               .hw_id          = HWID_TL_MR13U_V1,
-               .hw_rev         = 1,
-               .layout_id      = "4Mlzma",
-       }, {
-               .id             = "TL-MR3020v1",
-               .hw_id          = HWID_TL_MR3020_V1,
-               .hw_rev         = 1,
-               .layout_id      = "4Mlzma",
-       }, {
-               .id             = "TL-MR3220v1",
-               .hw_id          = HWID_TL_MR3220_V1,
-               .hw_rev         = 1,
-               .layout_id      = "4M",
-       }, {
-               .id             = "TL-MR3220v2",
-               .hw_id          = HWID_TL_MR3220_V2,
-               .hw_rev         = 1,
-               .layout_id      = "4Mlzma",
-       }, {
-               .id             = "TL-MR3420v1",
-               .hw_id          = HWID_TL_MR3420_V1,
-               .hw_rev         = 1,
-               .layout_id      = "4M",
-       }, {
-               .id             = "TL-MR3420v2",
-               .hw_id          = HWID_TL_MR3420_V2,
-               .hw_rev         = 1,
-               .layout_id      = "4Mlzma",
-       }, {
-               .id             = "TL-WA701Nv1",
-               .hw_id          = HWID_TL_WA701N_V1,
-               .hw_rev         = 1,
-               .layout_id      = "4M",
-       }, {
-               .id             = "TL-WA7510N",
-               .hw_id          = HWID_TL_WA7510N_V1,
-               .hw_rev         = 1,
-               .layout_id      = "4M",
-       }, {
-               .id             = "TL-WA801NDv1",
-               .hw_id          = HWID_TL_WA801ND_V1,
-               .hw_rev         = 1,
-               .layout_id      = "4M",
-       }, {
-               .id             = "TL-WA830REv1",
-               .hw_id          = HWID_TL_WA830RE_V1,
-               .hw_rev         = 1,
-               .layout_id      = "4M",
-       }, {
-               .id             = "TL-WA830REv2",
-               .hw_id          = HWID_TL_WA830RE_V2,
-               .hw_rev         = 1,
-               .layout_id      = "4M",
-       }, {
-               .id             = "TL-WA801NDv2",
-               .hw_id          = HWID_TL_WA801ND_V2,
-               .hw_rev         = 1,
-               .layout_id      = "4Mlzma",
-       }, {
-               .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-WDR4900v1",
-               .hw_id          = HWID_TL_WDR4900_V1,
-               .hw_rev         = 1,
-               .layout_id      = "16Mppc",
-       }, {
-               .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-WR743NDv2",
-               .hw_id          = HWID_TL_WR743ND_V2,
-               .hw_rev         = 1,
-               .layout_id      = "4Mlzma",
-       }, {
-               .id             = "TL-WR841Nv1.5",
-               .hw_id          = HWID_TL_WR841N_V1_5,
-               .hw_rev         = 2,
-               .layout_id      = "4M",
-       }, {
-               .id             = "TL-WR841NDv3",
-               .hw_id          = HWID_TL_WR841ND_V3,
-               .hw_rev         = 3,
-               .layout_id      = "4M",
-       }, {
-               .id             = "TL-WR841NDv5",
-               .hw_id          = HWID_TL_WR841ND_V5,
-               .hw_rev         = 1,
-               .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,
-               .layout_id      = "4M",
-       }, {
-               .id             = "TL-WR941NDv4",
-               .hw_id          = HWID_TL_WR941ND_V4,
-               .hw_rev         = 1,
-               .layout_id      = "4M",
-       }, {
-               .id             = "TL-WR1041Nv2",
-               .hw_id          = HWID_TL_WR1041N_V2,
-               .hw_rev         = 1,
-               .layout_id      = "4Mlzma",
-       }, {
-               .id             = "TL-WR1043NDv1",
-               .hw_id          = HWID_TL_WR1043ND_V1,
-               .hw_rev         = 1,
-               .layout_id      = "8M",
-       }, {
-               .id             = "TL-WR1043NDv2",
-               .hw_id          = HWID_TL_WR1043ND_V2,
-               .hw_rev         = 1,
-               .layout_id      = "8Mlzma",
-       }, {
-               .id             = "TL-WR2543Nv1",
-               .hw_id          = HWID_TL_WR2543N_V1,
-               .hw_rev         = 1,
-               .layout_id      = "8Mlzma",
-       }, {
-               .id             = "TL-WR703Nv1",
-               .hw_id          = HWID_TL_WR703N_V1,
-               .hw_rev         = 1,
-               .layout_id      = "4Mlzma",
-       }, {
-               .id             = "TL-WR720Nv3",
-               .hw_id          = HWID_TL_WR720N_V3,
-               .hw_rev         = 1,
-               .layout_id      = "4Mlzma",
-       }, {
-               /* terminating entry */
-       }
+static const char *const regions[] = {
+       "UN", /* universal */
+       "US",
 };
 
 /*
@@ -385,7 +190,7 @@ static struct board_info boards[] = {
 #define ERRS(fmt, ...) do { \
        int save = errno; \
        fflush(0); \
-       fprintf(stderr, "[%s] *** error: " fmt "\n", \
+       fprintf(stderr, "[%s] *** error: " fmt ": %s\n", \
                        progname, ## __VA_ARGS__, strerror(save)); \
 } while (0)
 
@@ -393,15 +198,15 @@ static struct board_info boards[] = {
        fprintf(stderr, "[%s] " fmt "\n", progname, ## __VA_ARGS__ ); \
 } while (0)
 
-static struct board_info *find_board(char *id)
+static struct flash_layout *find_layout(const char *id)
 {
-       struct board_info *ret;
-       struct board_info *board;
+       struct flash_layout *ret;
+       struct flash_layout *l;
 
        ret = NULL;
-       for (board = boards; board->id != NULL; board++){
-               if (strcasecmp(id, board->id) == 0) {
-                       ret = board;
+       for (l = layouts; l->id != NULL; l++){
+               if (strcasecmp(id, l->id) == 0) {
+                       ret = l;
                        break;
                }
        };
@@ -409,49 +214,36 @@ static struct board_info *find_board(char *id)
        return ret;
 }
 
-static struct board_info *find_board_by_hwid(uint32_t hw_id)
-{
-       struct board_info *board;
+static uint32_t find_region(const char *country) {
+       uint32_t i;
 
-       for (board = boards; board->id != NULL; board++) {
-               if (hw_id == board->hw_id)
-                       return board;
-       };
+       for (i = 0; i < ARRAY_SIZE(regions); i++) {
+               if (strcasecmp(regions[i], country) == 0)
+                       return i;
+       }
 
-       return NULL;
+       return -1;
 }
 
-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 const char * get_region_country(uint32_t region) {
+       if (region < ARRAY_SIZE(regions))
+               return regions[region];
+       else
+               return "unknown";
 }
 
 static void usage(int status)
 {
-       FILE *stream = (status != EXIT_SUCCESS) ? stderr : stdout;
-       struct board_info *board;
-
-       fprintf(stream, "Usage: %s [OPTIONS...]\n", progname);
-       fprintf(stream,
+       fprintf(stderr, "Usage: %s [OPTIONS...]\n", progname);
+       fprintf(stderr,
 "\n"
 "Options:\n"
-"  -B <board>      create image for the board specified with <board>\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"
 "  -W <hwrev>      use hardware revision specified with <hwrev>\n"
+"  -C <country>    set region code to <country>\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"
@@ -459,10 +251,12 @@ static void usage(int status)
 "  -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"
+"  -S              ignore firmware size limit (only for combined images)\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"
 "  -v <version>    set firmware version to <version>\n"
+"  -m <version>    set header version to <version>\n"
 "  -i <file>       inspect given firmware file <file>\n"
 "  -x              extract kernel and rootfs while inspecting (requires -i)\n"
 "  -X <size>       reserve <size> bytes in the firmware image (hexval prefixed with 0x)\n"
@@ -472,7 +266,7 @@ static void usage(int status)
        exit(status);
 }
 
-static int get_md5(char *data, int size, char *md5)
+static void get_md5(const char *data, int size, uint8_t *md5)
 {
        MD5_CTX ctx;
 
@@ -499,7 +293,7 @@ static int get_file_stat(struct file_info *fdata)
        return 0;
 }
 
-static int read_to_buf(struct file_info *fdata, char *buf)
+static int read_to_buf(const struct file_info *fdata, char *buf)
 {
        FILE *f;
        int ret = EXIT_FAILURE;
@@ -528,6 +322,7 @@ static int read_to_buf(struct file_info *fdata, char *buf)
 static int check_options(void)
 {
        int ret;
+       int exceed_bytes;
 
        if (inspect_info.file_name) {
                ret = get_file_stat(&inspect_info);
@@ -540,33 +335,32 @@ static int check_options(void)
                return -1;
        }
 
-       if (board_id == NULL && opt_hw_id == NULL) {
-               ERR("either board or hardware id must be specified");
+       if (opt_hw_id == NULL) {
+               ERR("hardware id not specified");
                return -1;
        }
+       hw_id = strtoul(opt_hw_id, NULL, 0);
 
-       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;
+       if (layout_id == NULL) {
+               ERR("flash layout is not specified");
+               return -1;
+       }
 
-               hw_id = board->hw_id;
-               hw_rev = board->hw_rev;
-       } else {
-               if (layout_id == NULL) {
-                       ERR("flash layout is not specified");
-                       return -1;
+       if (opt_hw_rev)
+               hw_rev = strtoul(opt_hw_rev, NULL, 0);
+       else
+               hw_rev = 1;
+
+       if (country) {
+               region = find_region(country);
+               if (region == (uint32_t)-1) {
+                       char *end;
+                       region = strtoul(country, &end, 0);
+                       if (*end) {
+                               ERR("unknown region code \"%s\"", country);
+                               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);
@@ -601,10 +395,15 @@ static int check_options(void)
        kernel_len = kernel_info.file_size;
 
        if (combined) {
-               if (kernel_info.file_size >
-                   fw_max_len - sizeof(struct fw_header)) {
-                       ERR("kernel image is too big");
-                       return -1;
+               exceed_bytes = kernel_info.file_size - (fw_max_len - sizeof(struct fw_header));
+               if (exceed_bytes > 0) {
+                       if (!ignore_size) {
+                               ERR("kernel image is too big by %i bytes", exceed_bytes);
+                               return -1;
+                       }
+                       layout->fw_max_len = sizeof(struct fw_header) +
+                                            kernel_info.file_size +
+                                            reserved_space;
                }
        } else {
                if (rootfs_info.file_name == NULL) {
@@ -623,21 +422,21 @@ static int check_options(void)
 
                        DBG("kernel length aligned to %u", kernel_len);
 
-                       if (kernel_len + rootfs_info.file_size >
-                           fw_max_len - sizeof(struct fw_header)) {
-                               ERR("images are too big");
+                       exceed_bytes = kernel_len + rootfs_info.file_size - (fw_max_len - sizeof(struct fw_header));
+                       if (exceed_bytes > 0) {
+                               ERR("images are too big by %i bytes", exceed_bytes);
                                return -1;
                        }
                } else {
-                       if (kernel_info.file_size >
-                           rootfs_ofs - sizeof(struct fw_header)) {
-                               ERR("kernel image is too big");
+                       exceed_bytes = kernel_info.file_size - (rootfs_ofs - sizeof(struct fw_header));
+                       if (exceed_bytes > 0) {
+                               ERR("kernel image is too big by %i bytes", exceed_bytes);
                                return -1;
                        }
 
-                       if (rootfs_info.file_size >
-                           (fw_max_len - rootfs_ofs)) {
-                               ERR("rootfs image is too big");
+                       exceed_bytes = rootfs_info.file_size - (fw_max_len - rootfs_ofs);
+                       if (exceed_bytes > 0) {
+                               ERR("rootfs image is too big by %i bytes", exceed_bytes);
                                return -1;
                        }
                }
@@ -654,6 +453,15 @@ static int check_options(void)
                return -1;
        }
 
+       if (opt_hdr_ver == 1) {
+               hdr_ver = HEADER_VERSION_V1;
+       } else if (opt_hdr_ver == 2) {
+               hdr_ver = HEADER_VERSION_V2;
+       } else {
+               ERR("invalid header version '%u'", opt_hdr_ver);
+               return -1;
+       }
+
        return 0;
 }
 
@@ -663,11 +471,12 @@ static void fill_header(char *buf, int len)
 
        memset(hdr, 0, sizeof(struct fw_header));
 
-       hdr->version = htonl(HEADER_VERSION_V1);
+       hdr->version = htonl(hdr_ver);
        strncpy(hdr->vendor_name, vendor, sizeof(hdr->vendor_name));
        strncpy(hdr->fw_version, version, sizeof(hdr->fw_version));
        hdr->hw_id = htonl(hw_id);
        hdr->hw_rev = htonl(hw_rev);
+       hdr->region = htonl(region);
 
        if (boot_info.file_size == 0)
                memcpy(hdr->md5sum1, md5salt_normal, sizeof(hdr->md5sum1));
@@ -725,7 +534,7 @@ static int pad_jffs2(char *buf, int currlen)
        return len;
 }
 
-static int write_fw(char *data, int len)
+static int write_fw(const char *data, int len)
 {
        FILE *f;
        int ret = EXIT_FAILURE;
@@ -817,61 +626,27 @@ static int build_fw(void)
 }
 
 /* Helper functions to inspect_fw() representing different output formats */
-static inline void inspect_fw_pstr(char *label, char *str)
+static inline void inspect_fw_pstr(const char *label, const char *str)
 {
        printf("%-23s: %s\n", label, str);
 }
 
-static inline void inspect_fw_phex(char *label, uint32_t val)
+static inline void inspect_fw_phex(const char *label, uint32_t val)
 {
        printf("%-23s: 0x%08x\n", label, val);
 }
 
-static inline void inspect_fw_phexpost(char *label,
-                                       uint32_t val, char *post)
+static inline void inspect_fw_phexpost(const char *label, uint32_t val, const char *post)
 {
        printf("%-23s: 0x%08x (%s)\n", label, val, post);
 }
 
-static inline void inspect_fw_phexdef(char *label,
-                                      uint32_t val, uint32_t defval)
-{
-       printf("%-23s: 0x%08x                  ", label, val);
-
-       if (val == defval)
-               printf("(== OpenWrt default)\n");
-       else
-               printf("(OpenWrt default: 0x%08x)\n", defval);
-}
-
-static inline void inspect_fw_phexexp(char *label,
-                                      uint32_t val, uint32_t expval)
-{
-       printf("%-23s: 0x%08x ", label, val);
-
-       if (val == expval)
-               printf("(ok)\n");
-       else
-               printf("(expected: 0x%08x)\n", expval);
-}
-
-static inline void inspect_fw_phexdec(char *label, uint32_t val)
+static inline void inspect_fw_phexdec(const char *label, uint32_t val)
 {
        printf("%-23s: 0x%08x / %8u bytes\n", label, val, val);
 }
 
-static inline void inspect_fw_phexdecdef(char *label,
-                                         uint32_t val, uint32_t defval)
-{
-       printf("%-23s: 0x%08x / %8u bytes ", label, val, val);
-
-       if (val == defval)
-               printf("(== OpenWrt default)\n");
-       else
-               printf("(OpenWrt default: 0x%08x)\n", defval);
-}
-
-static inline void inspect_fw_pmd5sum(char *label, uint8_t *val, char *text)
+static inline void inspect_fw_pmd5sum(const char *label, const uint8_t *val, const char *text)
 {
        int i;
 
@@ -886,7 +661,6 @@ static int inspect_fw(void)
        char *buf;
        struct fw_header *hdr;
        uint8_t md5sum[MD5SUM_LEN];
-       struct board_info *board;
        int ret = EXIT_FAILURE;
 
        buf = malloc(inspect_info.file_size);
@@ -903,16 +677,14 @@ static int inspect_fw(void)
        inspect_fw_pstr("File name", inspect_info.file_name);
        inspect_fw_phexdec("File size", inspect_info.file_size);
 
-       if (ntohl(hdr->version) != HEADER_VERSION_V1) {
-               ERR("file does not seem to have V1 header!\n");
+       if ((ntohl(hdr->version) != HEADER_VERSION_V1) &&
+           (ntohl(hdr->version) != HEADER_VERSION_V2)) {
+               ERR("file does not seem to have V1/V2 header!\n");
                goto out_free_buf;
        }
 
        inspect_fw_phexdec("Version 1 Header size", sizeof(struct fw_header));
 
-       if (ntohl(hdr->unk1) != 0)
-               inspect_fw_phexdec("Unknown value 1", hdr->unk1);
-
        memcpy(md5sum, hdr->md5sum1, sizeof(md5sum));
        if (ntohl(hdr->boot_len) == 0)
                memcpy(hdr->md5sum1, md5salt_normal, sizeof(md5sum));
@@ -937,19 +709,9 @@ static int inspect_fw(void)
 
        inspect_fw_pstr("Vendor name", hdr->vendor_name);
        inspect_fw_pstr("Firmware version", hdr->fw_version);
-       board = find_board_by_hwid(ntohl(hdr->hw_id));
-       if (board) {
-               layout = find_layout(board->layout_id);
-               inspect_fw_phexpost("Hardware ID",
-                                   ntohl(hdr->hw_id), board->id);
-               inspect_fw_phexexp("Hardware Revision",
-                                  ntohl(hdr->hw_rev), board->hw_rev);
-       } else {
-               inspect_fw_phexpost("Hardware ID",
-                                   ntohl(hdr->hw_id), "unknown");
-               inspect_fw_phex("Hardware Revision",
-                               ntohl(hdr->hw_rev));
-       }
+       inspect_fw_phex("Hardware ID", ntohl(hdr->hw_id));
+       inspect_fw_phex("Hardware Revision", ntohl(hdr->hw_rev));
+       inspect_fw_phexpost("Region code", ntohl(hdr->region), get_region_country(ntohl(hdr->region)));
 
        printf("\n");
 
@@ -957,24 +719,12 @@ static int inspect_fw(void)
                           ntohl(hdr->kernel_ofs));
        inspect_fw_phexdec("Kernel data length",
                           ntohl(hdr->kernel_len));
-       if (board) {
-               inspect_fw_phexdef("Kernel load address",
-                                  ntohl(hdr->kernel_la),
-                                  layout ? layout->kernel_la : 0xffffffff);
-               inspect_fw_phexdef("Kernel entry point",
-                                  ntohl(hdr->kernel_ep),
-                                  layout ? layout->kernel_ep : 0xffffffff);
-               inspect_fw_phexdecdef("Rootfs data offset",
-                                     ntohl(hdr->rootfs_ofs),
-                                     layout ? layout->rootfs_ofs : 0xffffffff);
-       } else {
-               inspect_fw_phex("Kernel load address",
-                               ntohl(hdr->kernel_la));
-               inspect_fw_phex("Kernel entry point",
-                               ntohl(hdr->kernel_ep));
-               inspect_fw_phexdec("Rootfs data offset",
-                                  ntohl(hdr->rootfs_ofs));
-       }
+       inspect_fw_phex("Kernel load address",
+                       ntohl(hdr->kernel_la));
+       inspect_fw_phex("Kernel entry point",
+                       ntohl(hdr->kernel_ep));
+       inspect_fw_phexdec("Rootfs data offset",
+                          ntohl(hdr->rootfs_ofs));
        inspect_fw_phexdec("Rootfs data length",
                           ntohl(hdr->rootfs_len));
        inspect_fw_phexdec("Boot loader data offset",
@@ -1030,16 +780,13 @@ static int inspect_fw(void)
 int main(int argc, char *argv[])
 {
        int ret = EXIT_FAILURE;
-       int err;
-
-       FILE *outfile;
 
        progname = basename(argv[0]);
 
        while ( 1 ) {
                int c;
 
-               c = getopt(argc, argv, "a:B:H:E:F:L:V:N:W:ci:k:r:R:o:xX:hsjv:");
+               c = getopt(argc, argv, "a:H:E:F:L:m:V:N:W:C:ci:k:r:R:o:xX:hsSjv:");
                if (c == -1)
                        break;
 
@@ -1047,9 +794,6 @@ int main(int argc, char *argv[])
                case 'a':
                        sscanf(optarg, "0x%x", &rootfs_align);
                        break;
-               case 'B':
-                       board_id = optarg;
-                       break;
                case 'H':
                        opt_hw_id = optarg;
                        break;
@@ -1062,9 +806,15 @@ int main(int argc, char *argv[])
                case 'W':
                        opt_hw_rev = optarg;
                        break;
+               case 'C':
+                       country = optarg;
+                       break;
                case 'L':
                        sscanf(optarg, "0x%x", &kernel_la);
                        break;
+               case 'm':
+                       sscanf(optarg, "%u", &opt_hdr_ver);
+                       break;
                case 'V':
                        version = optarg;
                        break;
@@ -1092,6 +842,9 @@ int main(int argc, char *argv[])
                case 's':
                        strip_padding = 1;
                        break;
+               case 'S':
+                       ignore_size = 1;
+                       break;
                case 'i':
                        inspect_info.file_name = optarg;
                        break;
@@ -1125,4 +878,3 @@ int main(int argc, char *argv[])
  out:
        return ret;
 }
-