firmware-utils: tplink-safeloader: set EAP235-Wall v1 soft-version
[openwrt/openwrt.git] / tools / firmware-utils / src / tplink-safeloader.c
index 8a47e6a58f542bddeec9dc15f227bc280f83f574..b20d1fdd30e0236c9f2c42e596807d01b92808cc 100644 (file)
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2014, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
@@ -82,19 +63,40 @@ enum partition_trail_value {
        PART_TRAIL_NONE = 0x100
 };
 
+/** soft-version value overwrite types
+ * The default (for an uninitialised soft_ver field) is to use the numerical
+ * version number "0.0.0"
+ */
+enum soft_ver_type {
+       SOFT_VER_TYPE_NUMERIC = 0,
+       SOFT_VER_TYPE_TEXT = 1,
+};
+
 /** Firmware layout description */
 struct device_info {
        const char *id;
        const char *vendor;
        const char *support_list;
        enum partition_trail_value part_trail;
-       const char *soft_ver;
+       struct {
+               enum soft_ver_type type;
+               union {
+                       const char *text;
+                       uint8_t num[3];
+               };
+       } soft_ver;
        uint32_t soft_ver_compat_level;
        struct flash_partition_entry partitions[MAX_PARTITIONS+1];
        const char *first_sysupgrade_partition;
        const char *last_sysupgrade_partition;
 };
 
+#define SOFT_VER_TEXT(_t) {.type = SOFT_VER_TYPE_TEXT, .text = _t}
+#define SOFT_VER_NUMERIC(_maj, _min, _patch) {  \
+               .type = SOFT_VER_TYPE_NUMERIC,          \
+               .num = {_maj, _min, _patch}}
+#define SOFT_VER_DEFAULT SOFT_VER_NUMERIC(0, 0, 0)
+
 struct __attribute__((__packed__)) meta_header {
        uint32_t length;
        uint32_t zero;
@@ -148,7 +150,7 @@ static struct device_info boards[] = {
                        "CPE220(TP-LINK|US|N300-2):1.1\r\n"
                        "CPE220(TP-LINK|EU|N300-2):1.1\r\n",
                .part_trail = 0xff,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -156,8 +158,7 @@ static struct device_info boards[] = {
                        {"default-mac", 0x30000, 0x00020},
                        {"product-info", 0x31100, 0x00100},
                        {"signature", 0x32000, 0x00400},
-                       {"os-image", 0x40000, 0x300000},
-                       {"file-system", 0x340000, 0x470000},
+                       {"firmware", 0x40000, 0x770000},
                        {"soft-version", 0x7b0000, 0x00100},
                        {"support-list", 0x7b1000, 0x00400},
                        {"user-config", 0x7c0000, 0x10000},
@@ -188,7 +189,7 @@ static struct device_info boards[] = {
                        "CPE210(TP-LINK|EU|N300-2):2.0\r\n"
                        "CPE210(TP-LINK|US|N300-2):2.0\r\n",
                .part_trail = 0xff,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -230,7 +231,7 @@ static struct device_info boards[] = {
                        "CPE210(TP-LINK|UN|N300-2|00000000):3.20\r\n"
                        "CPE210(TP-LINK|US|N300-2|55530000):3.20\r\n",
                .part_trail = 0xff,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -271,7 +272,7 @@ static struct device_info boards[] = {
                        "CPE220(TP-LINK|EU|N300-2):2.0\r\n"
                        "CPE220(TP-LINK|US|N300-2):2.0\r\n",
                .part_trail = 0xff,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -279,8 +280,7 @@ static struct device_info boards[] = {
                        {"default-mac", 0x30000, 0x00020},
                        {"product-info", 0x31100, 0x00100},
                        {"signature", 0x32000, 0x00400},
-                       {"os-image", 0x40000, 0x300000},
-                       {"file-system", 0x340000, 0x470000},
+                       {"firmware", 0x40000, 0x770000},
                        {"soft-version", 0x7b0000, 0x00100},
                        {"support-list", 0x7b1000, 0x00400},
                        {"user-config", 0x7c0000, 0x10000},
@@ -311,7 +311,7 @@ static struct device_info boards[] = {
                        "CPE220(TP-LINK|EU|N300-2):3.0\r\n"
                        "CPE220(TP-LINK|US|N300-2):3.0\r\n",
                .part_trail = 0xff,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -350,7 +350,7 @@ static struct device_info boards[] = {
                        "CPE520(TP-LINK|US|N300-5):1.1\r\n"
                        "CPE520(TP-LINK|EU|N300-5):1.1\r\n",
                .part_trail = 0xff,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -358,8 +358,7 @@ static struct device_info boards[] = {
                        {"default-mac", 0x30000, 0x00020},
                        {"product-info", 0x31100, 0x00100},
                        {"signature", 0x32000, 0x00400},
-                       {"os-image", 0x40000, 0x300000},
-                       {"file-system", 0x340000, 0x470000},
+                       {"firmware", 0x40000, 0x770000},
                        {"soft-version", 0x7b0000, 0x00100},
                        {"support-list", 0x7b1000, 0x00400},
                        {"user-config", 0x7c0000, 0x10000},
@@ -392,7 +391,7 @@ static struct device_info boards[] = {
                        "CPE510(TP-LINK|EU|N300-5):2.0\r\n"
                        "CPE510(TP-LINK|US|N300-5):2.0\r\n",
                .part_trail = 0xff,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -400,8 +399,7 @@ static struct device_info boards[] = {
                        {"default-mac", 0x30000, 0x00020},
                        {"product-info", 0x31100, 0x00100},
                        {"signature", 0x32000, 0x00400},
-                       {"os-image", 0x40000, 0x300000},
-                       {"file-system", 0x340000, 0x470000},
+                       {"firmware", 0x40000, 0x770000},
                        {"soft-version", 0x7b0000, 0x00100},
                        {"support-list", 0x7b1000, 0x00400},
                        {"user-config", 0x7c0000, 0x10000},
@@ -437,7 +435,7 @@ static struct device_info boards[] = {
                        "CPE510(TP-LINK|US|N300-5|55530000):3.20\r\n"
                        "CPE510(TP-LINK|EU|N300-5|45550000):3.20\r\n",
                .part_trail = 0xff,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -445,8 +443,7 @@ static struct device_info boards[] = {
                        {"default-mac", 0x30000, 0x00020},
                        {"product-info", 0x31100, 0x00100},
                        {"signature", 0x32000, 0x00400},
-                       {"os-image", 0x40000, 0x300000},
-                       {"file-system", 0x340000, 0x470000},
+                       {"firmware", 0x40000, 0x770000},
                        {"soft-version", 0x7b0000, 0x00100},
                        {"support-list", 0x7b1000, 0x00400},
                        {"user-config", 0x7c0000, 0x10000},
@@ -477,7 +474,7 @@ static struct device_info boards[] = {
                        "CPE610(TP-LINK|EU|N300-5):1.0\r\n"
                        "CPE610(TP-LINK|US|N300-5):1.0\r\n",
                .part_trail = 0xff,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -485,8 +482,7 @@ static struct device_info boards[] = {
                        {"default-mac", 0x30000, 0x00020},
                        {"product-info", 0x31100, 0x00100},
                        {"signature", 0x32000, 0x00400},
-                       {"os-image", 0x40000, 0x300000},
-                       {"file-system", 0x340000, 0x470000},
+                       {"firmware", 0x40000, 0x770000},
                        {"soft-version", 0x7b0000, 0x00100},
                        {"support-list", 0x7b1000, 0x00400},
                        {"user-config", 0x7c0000, 0x10000},
@@ -517,7 +513,7 @@ static struct device_info boards[] = {
                        "CPE610(TP-LINK|EU|N300-5):2.0\r\n"
                        "CPE610(TP-LINK|US|N300-5):2.0\r\n",
                .part_trail = 0xff,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -525,8 +521,7 @@ static struct device_info boards[] = {
                        {"default-mac", 0x30000, 0x00020},
                        {"product-info", 0x31100, 0x00100},
                        {"signature", 0x32000, 0x00400},
-                       {"os-image", 0x40000, 0x300000},
-                       {"file-system", 0x340000, 0x470000},
+                       {"firmware", 0x40000, 0x770000},
                        {"soft-version", 0x7b0000, 0x00100},
                        {"support-list", 0x7b1000, 0x00400},
                        {"user-config", 0x7c0000, 0x10000},
@@ -549,7 +544,7 @@ static struct device_info boards[] = {
                        "WBS210(TP-LINK|US|N300-2):1.20\r\n"
                        "WBS210(TP-LINK|EU|N300-2):1.20\r\n",
                .part_trail = 0xff,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -557,8 +552,7 @@ static struct device_info boards[] = {
                        {"default-mac", 0x30000, 0x00020},
                        {"product-info", 0x31100, 0x00100},
                        {"signature", 0x32000, 0x00400},
-                       {"os-image", 0x40000, 0x300000},
-                       {"file-system", 0x340000, 0x470000},
+                       {"firmware", 0x40000, 0x770000},
                        {"soft-version", 0x7b0000, 0x00100},
                        {"support-list", 0x7b1000, 0x00400},
                        {"user-config", 0x7c0000, 0x10000},
@@ -581,7 +575,7 @@ static struct device_info boards[] = {
                        "WBS210(TP-LINK|US|N300-2|55530000):2.0\r\n"
                        "WBS210(TP-LINK|EU|N300-2|45550000):2.0\r\n",
                .part_trail = 0xff,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -589,8 +583,7 @@ static struct device_info boards[] = {
                        {"default-mac", 0x30000, 0x00020},
                        {"product-info", 0x31100, 0x00100},
                        {"signature", 0x32000, 0x00400},
-                       {"os-image", 0x40000, 0x300000},
-                       {"file-system", 0x340000, 0x470000},
+                       {"firmware", 0x40000, 0x770000},
                        {"soft-version", 0x7b0000, 0x00100},
                        {"support-list", 0x7b1000, 0x00400},
                        {"user-config", 0x7c0000, 0x10000},
@@ -614,7 +607,7 @@ static struct device_info boards[] = {
                        "WBS510(TP-LINK|EU|N300-5):1.20\r\n"
                        "WBS510(TP-LINK|CA|N300-5):1.20\r\n",
                .part_trail = 0xff,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -622,8 +615,7 @@ static struct device_info boards[] = {
                        {"default-mac", 0x30000, 0x00020},
                        {"product-info", 0x31100, 0x00100},
                        {"signature", 0x32000, 0x00400},
-                       {"os-image", 0x40000, 0x300000},
-                       {"file-system", 0x340000, 0x470000},
+                       {"firmware", 0x40000, 0x770000},
                        {"soft-version", 0x7b0000, 0x00100},
                        {"support-list", 0x7b1000, 0x00400},
                        {"user-config", 0x7c0000, 0x10000},
@@ -647,7 +639,7 @@ static struct device_info boards[] = {
                        "WBS510(TP-LINK|EU|N300-5|45550000):2.0\r\n"
                        "WBS510(TP-LINK|CA|N300-5|43410000):2.0\r\n",
                .part_trail = 0xff,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -655,8 +647,7 @@ static struct device_info boards[] = {
                        {"default-mac", 0x30000, 0x00020},
                        {"product-info", 0x31100, 0x00100},
                        {"signature", 0x32000, 0x00400},
-                       {"os-image", 0x40000, 0x300000},
-                       {"file-system", 0x340000, 0x470000},
+                       {"firmware", 0x40000, 0x770000},
                        {"soft-version", 0x7b0000, 0x00100},
                        {"support-list", 0x7b1000, 0x00400},
                        {"user-config", 0x7c0000, 0x10000},
@@ -678,7 +669,7 @@ static struct device_info boards[] = {
                        "SupportList:\r\n"
                        "{product_name:AD7200,product_ver:1.0.0,special_id:00000000}\r\n",
                .part_trail = 0x00,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"SBL1", 0x00000, 0x20000},
@@ -722,7 +713,7 @@ static struct device_info boards[] = {
                        "SupportList:\r\n"
                        "{product_name:Archer C2600,product_ver:1.0.0,special_id:00000000}\r\n",
                .part_trail = 0x00,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                /**
                    We use a bigger os-image partition than the stock images (and thus
@@ -774,7 +765,7 @@ static struct device_info boards[] = {
                        "{product_name:Archer A7,product_ver:5.0.0,special_id:54570000}\n"
                        "{product_name:Archer A7,product_ver:5.0.0,special_id:52550000}\n",
                .part_trail = 0x00,
-               .soft_ver = "soft_ver:1.0.0\n",
+               .soft_ver = SOFT_VER_TEXT("soft_ver:1.0.0\n"),
 
                /* We're using a dynamic kernel/rootfs split here */
                .partitions = {
@@ -812,7 +803,7 @@ static struct device_info boards[] = {
                        "{product_name:ArcherC2,product_ver:3.0.0,special_id:55530000}\n"
                        "{product_name:ArcherC2,product_ver:3.0.0,special_id:45550000}\n",
                .part_trail = 0x00,
-               .soft_ver = "soft_ver:3.0.1\n",
+               .soft_ver = SOFT_VER_TEXT("soft_ver:3.0.1\n"),
 
                /** We're using a dynamic kernel/rootfs split here */
 
@@ -850,7 +841,7 @@ static struct device_info boards[] = {
                        "{product_name:ArcherC25,product_ver:1.0.0,special_id:55530000}\n"
                        "{product_name:ArcherC25,product_ver:1.0.0,special_id:45550000}\n",
                .part_trail = 0x00,
-               .soft_ver = "soft_ver:1.0.0\n",
+               .soft_ver = SOFT_VER_TEXT("soft_ver:1.0.0\n"),
 
                /* We're using a dynamic kernel/rootfs split here */
                .partitions = {
@@ -889,7 +880,7 @@ static struct device_info boards[] = {
                        "{product_name:Archer C58,product_ver:1.0.0,special_id:45550000}\r\n"
                        "{product_name:Archer C58,product_ver:1.0.0,special_id:55530000}\r\n",
                .part_trail = 0x00,
-               .soft_ver = "soft_ver:1.0.0\n",
+               .soft_ver = SOFT_VER_TEXT("soft_ver:1.0.0\n"),
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x10000},
@@ -924,7 +915,7 @@ static struct device_info boards[] = {
                        "{product_name:Archer C59,product_ver:1.0.0,special_id:52550000}\r\n"
                        "{product_name:Archer C59,product_ver:1.0.0,special_id:55530000}\r\n",
                .part_trail = 0x00,
-               .soft_ver = "soft_ver:1.0.0\n",
+               .soft_ver = SOFT_VER_TEXT("soft_ver:1.0.0\n"),
 
                /* We're using a dynamic kernel/rootfs split here */
                .partitions = {
@@ -962,7 +953,7 @@ static struct device_info boards[] = {
                        "{product_name:Archer C59,product_ver:2.0.0,special_id:45550000}\r\n"
                        "{product_name:Archer C59,product_ver:2.0.0,special_id:55530000}\r\n",
                .part_trail = 0x00,
-               .soft_ver = "soft_ver:2.0.0 Build 20161206 rel.7303\n",
+               .soft_ver = SOFT_VER_TEXT("soft_ver:2.0.0 Build 20161206 rel.7303\n"),
 
                /** We're using a dynamic kernel/rootfs split here */
                .partitions = {
@@ -1002,7 +993,7 @@ static struct device_info boards[] = {
                        "{product_name:Archer C6,product_ver:2.0.0,special_id:52550000}\r\n"
                        "{product_name:Archer C6,product_ver:2.0.0,special_id:4A500000}\r\n",
                .part_trail = 0x00,
-               .soft_ver = "soft_ver:1.9.1\n",
+               .soft_ver = SOFT_VER_TEXT("soft_ver:1.9.1\n"),
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -1037,7 +1028,7 @@ static struct device_info boards[] = {
                        "{product_name:Archer A6,product_ver:2.0.0,special_id:54570000}\n"
                        "{product_name:Archer C6,product_ver:2.0.0,special_id:55530000}\n",
                .part_trail = 0x00,
-               .soft_ver = "soft_ver:1.9.1\n",
+               .soft_ver = SOFT_VER_TEXT("soft_ver:1.9.1\n"),
 
                .partitions = {
                        {"factory-boot", 0x00000, 0x20000},
@@ -1061,7 +1052,120 @@ static struct device_info boards[] = {
                .first_sysupgrade_partition = "os-image",
                .last_sysupgrade_partition = "file-system",
        },
+       /** Firmware layout for the Archer C6 v3 */
+       {
+               .id     = "ARCHER-C6-V3",
+               .vendor = "",
+               .support_list =
+                       "SupportList:\n"
+                       "{product_name:Archer C6,product_ver:3.20,special_id:55530000}"
+                       "{product_name:Archer C6,product_ver:3.20,special_id:45550000}"
+                       "{product_name:Archer C6,product_ver:3.20,special_id:52550000}"
+                       "{product_name:Archer C6,product_ver:3.20,special_id:4A500000}"
+                       "{product_name:Archer C6,product_ver:3.20,special_id:4B520000}",
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_TEXT("soft_ver:1.0.9\n"),
+
+               .partitions = {
+                       {"fs-uboot", 0x00000, 0x40000},
+                       {"firmware", 0x40000, 0xf60000},
+                       {"default-mac", 0xfa0000, 0x00200},
+                       {"pin", 0xfa0200, 0x00100},
+                       {"device-id", 0xfa0300, 0x00100},
+                       {"product-info", 0xfa0400, 0x0fc00},
+                       {"default-config", 0xfb0000, 0x08000},
+                       {"ap-def-config", 0xfb8000, 0x08000},
+                       {"user-config", 0xfc0000, 0x0a000},
+                       {"ag-config", 0xfca000, 0x04000},
+                       {"certificate", 0xfce000, 0x02000},
+                       {"ap-config", 0xfd0000, 0x06000},
+                       {"router-config", 0xfd6000, 0x06000},
+                       {"favicon", 0xfdc000, 0x02000},
+                       {"logo", 0xfde000, 0x02000},
+                       {"partition-table", 0xfe0000, 0x00800},
+                       {"soft-version", 0xfe0800, 0x00100},
+                       {"support-list", 0xfe0900, 0x00200},
+                       {"profile", 0xfe0b00, 0x03000},
+                       {"extra-para", 0xfe3b00, 0x00100},
+                       {"radio", 0xff0000, 0x10000},
+                       {NULL, 0, 0}
+               },
+               .first_sysupgrade_partition = "os-image",
+               .last_sysupgrade_partition = "file-system",
+       },
+       /** Firmware layout for the Archer A6 v3  */
+       {
+               .id     = "ARCHER-A6-V3",
+               .vendor = "",
+               .support_list =
+                       "SupportList:\n"
+                       "{product_name:Archer A6,product_ver:3.0.0,special_id:43410000}\n"
+                       "{product_name:Archer A6,product_ver:3.0.0,special_id:55530000}\n"
+                       "{product_name:Archer A6,product_ver:3.0.0,special_id:54570000}\n",
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_TEXT("soft_ver:1.0.5\n"),
+
+               .partitions = {
+                       {"fs-uboot", 0x00000, 0x40000},
+                       {"firmware", 0x40000, 0xf60000},
+                       {"default-mac", 0xfa0000, 0x00200},
+                       {"pin", 0xfa0200, 0x00100},
+                       {"device-id", 0xfa0300, 0x00100},
+                       {"product-info", 0xfa0400, 0x0fc00},
+                       {"default-config", 0xfb0000, 0x08000},
+                       {"ap-def-config", 0xfb8000, 0x08000},
+                       {"user-config", 0xfc0000, 0x0a000},
+                       {"ag-config", 0xfca000, 0x04000},
+                       {"certificate", 0xfce000, 0x02000},
+                       {"ap-config", 0xfd0000, 0x06000},
+                       {"router-config", 0xfd6000, 0x06000},
+                       {"favicon", 0xfdc000, 0x02000},
+                       {"logo", 0xfde000, 0x02000},
+                       {"partition-table", 0xfe0000, 0x00800},
+                       {"soft-version", 0xfe0800, 0x00100},
+                       {"support-list", 0xfe0900, 0x00200},
+                       {"profile", 0xfe0b00, 0x03000},
+                       {"extra-para", 0xfe3b00, 0x00100},
+                       {"radio", 0xff0000, 0x10000},
+                       {NULL, 0, 0}
+               },
+               .first_sysupgrade_partition = "os-image",
+               .last_sysupgrade_partition = "file-system",
+       },
+       /** Firmware layout for the Archer C6U v1 */
+       {
+               .id     = "ARCHER-C6U-V1",
+               .vendor = "",
+               .support_list =
+                       "SupportList:\n"
+                       "{product_name:Archer C6U,product_ver:1.0.0,special_id:45550000}\n",
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_TEXT("soft_ver:1.0.2\n"),
 
+               .partitions = {
+                       {"fs-uboot", 0x00000, 0x40000},
+                       {"firmware", 0x40000, 0xf60000},
+                       {"default-mac", 0xfa0000, 0x00200},
+                       {"pin", 0xfa0200, 0x00100},
+                       {"device-id", 0xfa0300, 0x00100},
+                       {"product-info", 0xfa0400, 0x0fc00},
+                       {"default-config", 0xfb0000, 0x08000},
+                       {"ap-def-config", 0xfb8000, 0x08000},
+                       {"user-config", 0xfc0000, 0x0c000},
+                       {"certificate", 0xfcc000, 0x04000},
+                       {"ap-config", 0xfd0000, 0x08000},
+                       {"router-config", 0xfd8000, 0x08000},
+                       {"partition-table", 0xfe0000, 0x00800},
+                       {"soft-version", 0xfe0800, 0x00100},
+                       {"support-list", 0xfe0900, 0x00200},
+                       {"profile", 0xfe0b00, 0x03000},
+                       {"extra-para", 0xfe3b00, 0x00100},
+                       {"radio", 0xff0000, 0x10000},
+                       {NULL, 0, 0}
+               },
+               .first_sysupgrade_partition = "os-image",
+               .last_sysupgrade_partition = "file-system",
+       },
        /** Firmware layout for the C60v1 */
        {
                .id     = "ARCHER-C60-V1",
@@ -1072,7 +1176,7 @@ static struct device_info boards[] = {
                        "{product_name:Archer C60,product_ver:1.0.0,special_id:45550000}\r\n"
                        "{product_name:Archer C60,product_ver:1.0.0,special_id:55530000}\r\n",
                .part_trail = 0x00,
-               .soft_ver = "soft_ver:1.0.0\n",
+               .soft_ver = SOFT_VER_TEXT("soft_ver:1.0.0\n"),
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x10000},
@@ -1106,7 +1210,7 @@ static struct device_info boards[] = {
                        "{product_name:Archer C60,product_ver:2.0.0,special_id:45550000}\r\n"
                        "{product_name:Archer C60,product_ver:2.0.0,special_id:55530000}\r\n",
                .part_trail = 0x00,
-               .soft_ver = "soft_ver:2.0.0\n",
+               .soft_ver = SOFT_VER_TEXT("soft_ver:2.0.0\n"),
 
                .partitions = {
                        {"factory-boot", 0x00000, 0x1fb00},
@@ -1142,7 +1246,7 @@ static struct device_info boards[] = {
                        "{product_name:Archer C60,product_ver:3.0.0,special_id:45550000}\r\n"
                        "{product_name:Archer C60,product_ver:3.0.0,special_id:55530000}\r\n",
                .part_trail = 0x00,
-               .soft_ver = "soft_ver:3.0.0\n",
+               .soft_ver = SOFT_VER_TEXT("soft_ver:3.0.0\n"),
 
                .partitions = {
                        {"factory-boot", 0x00000, 0x1fb00},
@@ -1178,7 +1282,7 @@ static struct device_info boards[] = {
                        "{product_name:ArcherC5,product_ver:2.0.0,special_id:55530000}\r\n"
                        "{product_name:ArcherC5,product_ver:2.0.0,special_id:4A500000}\r\n", /* JP version */
                .part_trail = 0x00,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x40000},
@@ -1219,7 +1323,7 @@ static struct device_info boards[] = {
                        "{product_name:Archer C7,product_ver:4.0.0,special_id:55530000}\n"
                        "{product_name:Archer C7,product_ver:4.0.0,special_id:43410000}\n",
                .part_trail = 0x00,
-               .soft_ver = "soft_ver:1.0.0\n",
+               .soft_ver = SOFT_VER_TEXT("soft_ver:1.0.0\n"),
 
                /* We're using a dynamic kernel/rootfs split here */
                .partitions = {
@@ -1264,7 +1368,7 @@ static struct device_info boards[] = {
                        "{product_name:Archer C7,product_ver:5.0.0,special_id:4B520000}\n",
 
                .part_trail = 0x00,
-               .soft_ver = "soft_ver:7.0.0\n",
+               .soft_ver = SOFT_VER_TEXT("soft_ver:7.0.0\n"),
 
                /* We're using a dynamic kernel/rootfs split here */
                .partitions = {
@@ -1307,7 +1411,7 @@ static struct device_info boards[] = {
                        "product_ver:1.0.0,"
                        "special_id:00000000}\n",
                .part_trail = 0x00,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x40000},
@@ -1340,7 +1444,7 @@ static struct device_info boards[] = {
                        "SupportList:\r\n"
                        "EAP120(TP-LINK|UN|N300-2):1.0\r\n",
                .part_trail = 0xff,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -1369,7 +1473,7 @@ static struct device_info boards[] = {
                        "SupportList:\r\n"
                        "EAP225-Outdoor(TP-Link|UN|AC1200-D):1.0\r\n",
                .part_trail = PART_TRAIL_NONE,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
                .soft_ver_compat_level = 1,
 
                .partitions = {
@@ -1398,7 +1502,7 @@ static struct device_info boards[] = {
                        "SupportList:\r\n"
                        "EAP225(TP-Link|UN|AC1350-D):3.0\r\n",
                .part_trail = PART_TRAIL_NONE,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
                .soft_ver_compat_level = 1,
 
                .partitions = {
@@ -1427,7 +1531,7 @@ static struct device_info boards[] = {
                        "SupportList:\r\n"
                        "EAP225-Wall(TP-Link|UN|AC1200-D):2.0\r\n",
                .part_trail = PART_TRAIL_NONE,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
                .soft_ver_compat_level = 1,
 
                .partitions = {
@@ -1456,7 +1560,7 @@ static struct device_info boards[] = {
                        "SupportList:\r\n"
                        "EAP235-Wall(TP-Link|UN|AC1200-D):1.0\r\n",
                .part_trail = PART_TRAIL_NONE,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_NUMERIC(3, 0, 0),
                .soft_ver_compat_level = 1,
 
                .partitions = {
@@ -1485,7 +1589,7 @@ static struct device_info boards[] = {
                        "SupportList:\r\n"
                        "EAP245(TP-LINK|UN|AC1750-D):1.0\r\n",
                .part_trail = PART_TRAIL_NONE,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -1511,7 +1615,7 @@ static struct device_info boards[] = {
                        "SupportList:\r\n"
                        "EAP245(TP-Link|UN|AC1750-D):3.0\r\n",
                .part_trail = PART_TRAIL_NONE,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
                .soft_ver_compat_level = 1,
 
                /** Firmware partition with dynamic kernel/rootfs split */
@@ -1536,6 +1640,48 @@ static struct device_info boards[] = {
                .last_sysupgrade_partition = "file-system"
        },
 
+       /** Firmware layout for the TL-WA1201 v2 */
+       {
+               .id     = "TL-WA1201-V2",
+               .vendor = "",
+               .support_list =
+                       "SupportList:\n"
+                       "{product_name:TL-WA1201,product_ver:2.0.0,special_id:45550000}\n"
+                       "{product_name:TL-WA1201,product_ver:2.0.0,special_id:55530000}\n",
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_TEXT("soft_ver:1.0.1 Build 20200709 rel.66244\n"),
+
+               .partitions = {
+                       {"fs-uboot", 0x00000, 0x20000},
+                       {"default-mac", 0x20000, 0x00200},
+                       {"pin", 0x20200, 0x00100},
+                       {"product-info", 0x20300, 0x00200},
+                       {"device-id", 0x20500, 0x0fb00},
+                       {"firmware", 0x30000, 0xce0000},
+                       {"portal-logo", 0xd10000, 0x20000},
+                       {"portal-back", 0xd30000, 0x200000},
+                       {"soft-version", 0xf30000, 0x00200},
+                       {"extra-para", 0xf30200, 0x00200},
+                       {"support-list", 0xf30400, 0x00200},
+                       {"profile", 0xf30600, 0x0fa00},
+                       {"apdef-config", 0xf40000, 0x10000},
+                       {"ap-config", 0xf50000, 0x10000},
+                       {"redef-config", 0xf60000, 0x10000},
+                       {"re-config", 0xf70000, 0x10000},
+                       {"multidef-config", 0xf80000, 0x10000},
+                       {"multi-config", 0xf90000, 0x10000},
+                       {"clientdef-config", 0xfa0000, 0x10000},
+                       {"client-config", 0xfb0000, 0x10000},
+                       {"partition-table", 0xfc0000, 0x10000},
+                       {"user-config", 0xfd0000, 0x10000},
+                       {"certificate", 0xfe0000, 0x10000},
+                       {"radio", 0xff0000, 0x10000},
+                       {NULL, 0, 0}
+               },
+               .first_sysupgrade_partition = "os-image",
+               .last_sysupgrade_partition = "file-system",
+       },
+
        /** Firmware layout for the TL-WA850RE v2 */
        {
                .id     = "TLWA850REV2",
@@ -1553,7 +1699,7 @@ static struct device_info boards[] = {
                        "{product_name:TL-WA850RE,product_ver:2.0.0,special_id:41550000}\n"
                        "{product_name:TL-WA850RE,product_ver:2.0.0,special_id:52550000}\n",
                .part_trail = 0x00,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                /**
                   576KB were moved from file-system to os-image
@@ -1595,7 +1741,7 @@ static struct device_info boards[] = {
                        "{product_name:TL-WA855RE,product_ver:1.0.0,special_id:41550000}\n"
                        "{product_name:TL-WA855RE,product_ver:1.0.0,special_id:52550000}\n",
                .part_trail = 0x00,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -1626,7 +1772,7 @@ static struct device_info boards[] = {
                        "SupportList:\n"
                        "{product_name:TL-WPA8630P,product_ver:2.0.0,special_id:45550000}\n",
                .part_trail = 0x00,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"factory-uboot", 0x00000, 0x20000},
@@ -1663,7 +1809,7 @@ static struct device_info boards[] = {
                        "{product_name:TL-WPA8630P,product_ver:2.0.0,special_id:44450000}\n"
                        "{product_name:TL-WPA8630P,product_ver:2.1.0,special_id:41550000}\n",
                .part_trail = 0x00,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"factory-uboot", 0x00000, 0x20000},
@@ -1698,7 +1844,7 @@ static struct device_info boards[] = {
                        "SupportList:\n"
                        "{product_name:TL-WPA8630P,product_ver:2.1.0,special_id:45550000}\n",
                .part_trail = 0x00,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"factory-uboot", 0x00000, 0x20000},
@@ -1734,7 +1880,7 @@ static struct device_info boards[] = {
                        "{product_name:TL-WR1043N,product_ver:5.0.0,special_id:45550000}\n"
                        "{product_name:TL-WR1043N,product_ver:5.0.0,special_id:55530000}\n",
                .part_trail = 0x00,
-               .soft_ver = "soft_ver:1.0.0\n",
+               .soft_ver = SOFT_VER_TEXT("soft_ver:1.0.0\n"),
                .partitions = {
                        {"factory-boot", 0x00000, 0x20000},
                        {"fs-uboot", 0x20000, 0x20000},
@@ -1768,7 +1914,7 @@ static struct device_info boards[] = {
                        "SupportList:\n"
                        "{product_name:TL-WR1043ND,product_ver:4.0.0,special_id:45550000}\n",
                .part_trail = 0x00,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                /* We're using a dynamic kernel/rootfs split here */
                .partitions = {
@@ -1801,7 +1947,7 @@ static struct device_info boards[] = {
                        "{product_name:TL-WR902AC,product_ver:1.0.0,special_id:45550000}\n"
                        "{product_name:TL-WR902AC,product_ver:1.0.0,special_id:55530000}\n",
                .part_trail = 0x00,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                /**
                   384KB were moved from file-system to os-image
@@ -1828,6 +1974,37 @@ static struct device_info boards[] = {
                .last_sysupgrade_partition = "file-system",
        },
 
+       /** Firmware layout for the TL-WR941HP v1 */
+       {
+               .id     = "TL-WR941HP-V1",
+               .vendor = "",
+               .support_list =
+                       "SupportList:\n"
+                       "{product_name:TL-WR941HP,product_ver:1.0.0,special_id:00000000}\n",
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_DEFAULT,
+
+               .partitions = {
+                       {"fs-uboot", 0x00000, 0x20000},
+                       {"firmware", 0x20000, 0x730000},
+                       {"default-mac", 0x750000, 0x00200},
+                       {"pin", 0x750200, 0x00200},
+                       {"product-info", 0x750400, 0x0fc00},
+                       {"soft-version", 0x760000, 0x0b000},
+                       {"support-list", 0x76b000, 0x04000},
+                       {"profile", 0x770000, 0x04000},
+                       {"default-config", 0x774000, 0x0b000},
+                       {"user-config", 0x780000, 0x40000},
+                       {"partition-table", 0x7c0000, 0x10000},
+                       {"log", 0x7d0000, 0x20000},
+                       {"radio", 0x7f0000, 0x10000},
+                       {NULL, 0, 0}
+               },
+
+               .first_sysupgrade_partition = "os-image",
+               .last_sysupgrade_partition = "file-system",
+       },
+
        /** Firmware layout for the TL-WR942N V1 */
        {
                .id     = "TLWR942NV1",
@@ -1837,7 +2014,7 @@ static struct device_info boards[] = {
                        "{product_name:TL-WR942N,product_ver:1.0.0,special_id:00000000}\r\n"
                        "{product_name:TL-WR942N,product_ver:1.0.0,special_id:52550000}\r\n",
                .part_trail = 0x00,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -1884,7 +2061,7 @@ static struct device_info boards[] = {
                        "{product_name:RE200,product_ver:2.0.0,special_id:54570000}\n"
                        "{product_name:RE200,product_ver:2.0.0,special_id:55530000}\n",
                .part_trail = 0x00,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -1928,7 +2105,7 @@ static struct device_info boards[] = {
                        "{product_name:RE200,product_ver:3.0.0,special_id:54570000}\n"
                        "{product_name:RE200,product_ver:3.0.0,special_id:55530000}\n",
                .part_trail = 0x00,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -1972,7 +2149,7 @@ static struct device_info boards[] = {
                        "{product_name:RE200,product_ver:4.0.0,special_id:49440000}\n"
                        "{product_name:RE200,product_ver:4.0.0,special_id:45470000}\n",
                .part_trail = 0x00,
-               .soft_ver = "soft_ver:1.1.0\n",
+               .soft_ver = SOFT_VER_TEXT("soft_ver:1.1.0\n"),
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -2015,7 +2192,7 @@ static struct device_info boards[] = {
                        "{product_name:RE220,product_ver:2.0.0,special_id:54570000}\n"
                        "{product_name:RE220,product_ver:2.0.0,special_id:55530000}\n",
                .part_trail = 0x00,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -2052,7 +2229,7 @@ static struct device_info boards[] = {
                        "{product_name:RE305,product_ver:1.0.0,special_id:41550000}\n"
                        "{product_name:RE305,product_ver:1.0.0,special_id:43410000}\n",
                .part_trail = 0x00,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -2088,7 +2265,7 @@ static struct device_info boards[] = {
                        "{product_name:RE350,product_ver:1.0.0,special_id:4b520000}\n"
                        "{product_name:RE350,product_ver:1.0.0,special_id:4a500000}\n",
                .part_trail = 0x00,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                /** We're using a dynamic kernel/rootfs split here */
                .partitions = {
@@ -2119,7 +2296,7 @@ static struct device_info boards[] = {
                        "SupportList:\n"
                        "{product_name:RE350K,product_ver:1.0.0,special_id:00000000,product_region:US}\n",
                .part_trail = 0x00,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                /** We're using a dynamic kernel/rootfs split here */
                .partitions = {
@@ -2158,7 +2335,7 @@ static struct device_info boards[] = {
                        "{product_name:RE355,product_ver:1.0.0,special_id:4B520000}\r\n"
                        "{product_name:RE355,product_ver:1.0.0,special_id:55534100}\r\n",
                .part_trail = 0x00,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                /* We're using a dynamic kernel/rootfs split here */
                .partitions = {
@@ -2196,7 +2373,7 @@ static struct device_info boards[] = {
                        "{product_name:RE450,product_ver:1.0.0,special_id:4B520000}\r\n"
                        "{product_name:RE450,product_ver:1.0.0,special_id:55534100}\r\n",
                .part_trail = 0x00,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                /** We're using a dynamic kernel/rootfs split here */
                .partitions = {
@@ -2235,7 +2412,7 @@ static struct device_info boards[] = {
                        "{product_name:RE450,product_ver:2.0.0,special_id:4B520000}\r\n"
                        "{product_name:RE450,product_ver:2.0.0,special_id:42520000}\r\n",
                .part_trail = 0x00,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                /* We're using a dynamic kernel/rootfs split here */
                .partitions = {
@@ -2274,7 +2451,47 @@ static struct device_info boards[] = {
                        "{product_name:RE450,product_ver:3.0.0,special_id:4B520000}\r\n"
                        "{product_name:RE450,product_ver:3.0.0,special_id:42520000}\r\n",
                .part_trail = 0x00,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
+
+               /* We're using a dynamic kernel/rootfs split here */
+               .partitions = {
+                       {"fs-uboot", 0x00000, 0x20000},
+                       {"default-mac", 0x20000, 0x00020},
+                       {"pin", 0x20020, 0x00020},
+                       {"product-info", 0x21000, 0x01000},
+                       {"partition-table", 0x22000, 0x02000},
+                       {"soft-version", 0x24000, 0x01000},
+                       {"support-list", 0x25000, 0x01000},
+                       {"profile", 0x26000, 0x08000},
+                       {"user-config", 0x2e000, 0x10000},
+                       {"default-config", 0x3e000, 0x10000},
+                       {"config-info", 0x4e000, 0x00400},
+                       {"firmware", 0x50000, 0x7a0000},
+                       {"radio", 0x7f0000, 0x10000},
+                       {NULL, 0, 0}
+               },
+
+               .first_sysupgrade_partition = "os-image",
+               .last_sysupgrade_partition = "file-system"
+       },
+
+       /** Firmware layout for the RE455 v1 */
+       {
+               .id     = "RE455-V1",
+               .vendor = "",
+               .support_list =
+                       "SupportList:\r\n"
+                       "{product_name:RE455,product_ver:1.0.0,special_id:00000000}\r\n"
+                       "{product_name:RE455,product_ver:1.0.0,special_id:55530000}\r\n"
+                       "{product_name:RE455,product_ver:1.0.0,special_id:45550000}\r\n"
+                       "{product_name:RE455,product_ver:1.0.0,special_id:4A500000}\r\n"
+                       "{product_name:RE455,product_ver:1.0.0,special_id:43410000}\r\n"
+                       "{product_name:RE455,product_ver:1.0.0,special_id:41550000}\r\n"
+                       "{product_name:RE455,product_ver:1.0.0,special_id:41530000}\r\n"
+                       "{product_name:RE455,product_ver:1.0.0,special_id:4B520000}\r\n"
+                       "{product_name:RE455,product_ver:1.0.0,special_id:42520000}\r\n",
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                /* We're using a dynamic kernel/rootfs split here */
                .partitions = {
@@ -2312,7 +2529,7 @@ static struct device_info boards[] = {
                        "{product_name:RE500,product_ver:1.0.0,special_id:41550000}\r\n"
                        "{product_name:RE500,product_ver:1.0.0,special_id:41530000}\r\n",
                .part_trail = 0x00,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                /* We're using a dynamic kernel/rootfs split here */
                .partitions = {
@@ -2349,7 +2566,7 @@ static struct device_info boards[] = {
                        "{product_name:RE650,product_ver:1.0.0,special_id:41550000}\r\n"
                        "{product_name:RE650,product_ver:1.0.0,special_id:41530000}\r\n",
                .part_trail = 0x00,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                /* We're using a dynamic kernel/rootfs split here */
                .partitions = {
@@ -2500,10 +2717,10 @@ static struct image_partition_entry make_soft_version(
 {
        /** If an info string is provided, use this instead of
         * the structured data, and include the null-termination */
-       if (info->soft_ver) {
-               uint32_t len = strlen(info->soft_ver) + 1;
+       if (info->soft_ver.type == SOFT_VER_TYPE_TEXT) {
+               uint32_t len = strlen(info->soft_ver.text) + 1;
                return init_meta_partition_entry("soft-version",
-                       info->soft_ver, len, info->part_trail);
+                       info->soft_ver.text, len, info->part_trail);
        }
 
        time_t t;
@@ -2518,14 +2735,15 @@ static struct image_partition_entry make_soft_version(
        struct soft_version s = {
                .pad1 = 0xff,
 
-               .version_major = 0,
-               .version_minor = 0,
-               .version_patch = 0,
+               .version_major = info->soft_ver.num[0],
+               .version_minor = info->soft_ver.num[1],
+               .version_patch = info->soft_ver.num[2],
 
                .year_hi = bcd((1900+tm->tm_year)/100),
                .year_lo = bcd(tm->tm_year%100),
                .month = bcd(tm->tm_mon+1),
                .day = bcd(tm->tm_mday),
+               .rev = htonl(rev),
 
                .compat_level = htonl(info->soft_ver_compat_level)
        };
@@ -2826,7 +3044,8 @@ static void build_image(const char *output,
        parts[4] = read_file("file-system", rootfs_image, add_jffs2_eof, file_system_partition);
 
        /* Some devices need the extra-para partition to accept the firmware */
-       if (strcasecmp(info->id, "ARCHER-A7-V5") == 0 ||
+       if (strcasecmp(info->id, "ARCHER-A6-V3") == 0 ||
+           strcasecmp(info->id, "ARCHER-A7-V5") == 0 ||
            strcasecmp(info->id, "ARCHER-C2-V3") == 0 ||
            strcasecmp(info->id, "ARCHER-C7-V4") == 0 ||
            strcasecmp(info->id, "ARCHER-C7-V5") == 0 ||
@@ -2834,11 +3053,14 @@ static void build_image(const char *output,
            strcasecmp(info->id, "ARCHER-C59-V2") == 0 ||
            strcasecmp(info->id, "ARCHER-C60-V2") == 0 ||
            strcasecmp(info->id, "ARCHER-C60-V3") == 0 ||
+           strcasecmp(info->id, "ARCHER-C6U-V1") == 0 ||
+           strcasecmp(info->id, "ARCHER-C6-V3") == 0 ||
            strcasecmp(info->id, "TLWR1043NV5") == 0) {
                const uint8_t extra_para[2] = {0x01, 0x00};
                parts[5] = make_extra_para(info, extra_para,
                        sizeof(extra_para));
-       } else if (strcasecmp(info->id, "ARCHER-C6-V2") == 0) {
+       } else if (strcasecmp(info->id, "ARCHER-C6-V2") == 0 ||
+                  strcasecmp(info->id, "TL-WA1201-V2") == 0) {
                const uint8_t extra_para[2] = {0x00, 0x01};
                parts[5] = make_extra_para(info, extra_para,
                        sizeof(extra_para));
@@ -3211,6 +3433,7 @@ static int firmware_info(const char *input)
 
                        printf("Version: %d.%d.%d\n", s->version_major, s->version_minor, s->version_patch);
                        printf("Date: %02x%02x-%02x-%02x\n", s->year_hi, s->year_lo, s->month, s->day);
+                       printf("Revision: %d\n", ntohl(s->rev));
                } else {
                        printf("Failed to parse data\n");
                }