mktplinkfw: fix help string, and remove duplicated option

[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 d3e9374..ad422d7 100644 (file)
--- a/tools/firmware-utils/src/mktplinkfw.c
+++ b/tools/firmware-utils/src/mktplinkfw.c
@@ -34,8 +34,12 @@
 
 #define HEADER_VERSION_V1      0x01000000
 #define HWID_TL_WR741ND_V1     0x07410001
 
 #define HEADER_VERSION_V1      0x01000000
 #define HWID_TL_WR741ND_V1     0x07410001

+#define HWID_TL_WR841N_V1_5    0x08410002

 #define HWID_TL_WR841ND_V3     0x08410003
 #define HWID_TL_WR841ND_V3     0x08410003

+#define HWID_TL_WR841ND_V5     0x08410005

 #define HWID_TL_WR941ND_V2     0x09410002
 #define HWID_TL_WR941ND_V2     0x09410002

+#define HWID_TL_WR941ND_V4     0x09410004
+#define HWID_TL_WR1043ND_V1    0x10430001

 
 #define MD5SUM_LEN     16
 
 
 #define MD5SUM_LEN     16
 


@@ -110,7 +114,15 @@ static struct board_info boards[] = {
                .fw_max_len     = 0x3c0000,
                .kernel_la      = 0x80060000,
                .kernel_ep      = 0x80060000,
                .fw_max_len     = 0x3c0000,
                .kernel_la      = 0x80060000,
                .kernel_ep      = 0x80060000,

-               .rootfs_ofs     = 0x120000,
+               .rootfs_ofs     = 0x140000,
+       }, {
+               .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,

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


@@ -118,7 +130,15 @@ static struct board_info boards[] = {
                .fw_max_len     = 0x3c0000,
                .kernel_la      = 0x80060000,
                .kernel_ep      = 0x80060000,
                .fw_max_len     = 0x3c0000,
                .kernel_la      = 0x80060000,
                .kernel_ep      = 0x80060000,

-               .rootfs_ofs     = 0x120000,
+               .rootfs_ofs     = 0x140000,
+       }, {
+               .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,

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


@@ -126,7 +146,23 @@ static struct board_info boards[] = {
                .fw_max_len     = 0x3c0000,
                .kernel_la      = 0x80060000,
                .kernel_ep      = 0x80060000,
                .fw_max_len     = 0x3c0000,
                .kernel_la      = 0x80060000,
                .kernel_ep      = 0x80060000,

-               .rootfs_ofs     = 0x120000,
+               .rootfs_ofs     = 0x140000,
+       }, {
+               .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,
+       }, {
+               .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,

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


@@ -182,7 +218,8 @@ static void usage(int status)
 "  -k <file>       read kernel image from the file <file>\n"
 "  -r <file>       read rootfs image from the file <file>\n"
 "  -o <file>       write output to the file <file>\n"
 "  -k <file>       read kernel image from the file <file>\n"
 "  -r <file>       read rootfs image from the file <file>\n"
 "  -o <file>       write output to the file <file>\n"

-"  -v <version>    set image version to <version>\n"
+"  -N <vendor>     set image vendor to <vendor>\n"
+"  -V <version>    set image version to <version>\n"

 "  -h              show this screen\n"
        );
 
 "  -h              show this screen\n"
        );
 


@@ -418,7 +455,7 @@ int main(int argc, char *argv[])
        while ( 1 ) {
                int c;
 
        while ( 1 ) {
                int c;
 

-               c = getopt(argc, argv, "B:V:N:ck:r:o:v:h:");
+               c = getopt(argc, argv, "B:V:N:ck:r:o:h");

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


@@ -444,9 +481,6 @@ int main(int argc, char *argv[])
                case 'o':
                        ofname = optarg;
                        break;
                case 'o':
                        ofname = optarg;
                        break;

-               case 'v':
-                       version = optarg;
-                       break;

                case 'h':
                        usage(EXIT_SUCCESS);
                        break;
                case 'h':
                        usage(EXIT_SUCCESS);
                        break;