ramips: fix USW-Flex reversed switch-port order
[openwrt/staging/mkresin.git] / tools / firmware-utils / src / tplink-safeloader.c
index 41b3b8aff992de0b22db6a0729bf575980fb49a2..03329a392617442da926fda17519f1aec7a43ee7 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.
 */
 
 
 
 
 #include <assert.h>
+#include <ctype.h>
 #include <errno.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -70,19 +53,50 @@ struct flash_partition_entry {
        uint32_t size;
 };
 
+/** Partition trailing padding definitions
+ * Values 0x00 to 0xff are reserved to indicate the padding value
+ * Values from 0x100 are reserved to indicate other behaviour */
+enum partition_trail_value {
+       PART_TRAIL_00   = 0x00,
+       PART_TRAIL_FF   = 0xff,
+       PART_TRAIL_MAX  = 0xff,
+       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;
-       char support_trail;
-       const char *soft_ver;
+       enum partition_trail_value part_trail;
+       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;
@@ -135,8 +149,8 @@ static struct device_info boards[] = {
                        "CPE220(TP-LINK|UN|N300-2):1.1\r\n"
                        "CPE220(TP-LINK|US|N300-2):1.1\r\n"
                        "CPE220(TP-LINK|EU|N300-2):1.1\r\n",
-               .support_trail = '\xff',
-               .soft_ver = NULL,
+               .part_trail = 0xff,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -144,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},
@@ -175,8 +188,8 @@ static struct device_info boards[] = {
                        "CPE210(TP-LINK|UN|N300-2):2.0\r\n"
                        "CPE210(TP-LINK|EU|N300-2):2.0\r\n"
                        "CPE210(TP-LINK|US|N300-2):2.0\r\n",
-               .support_trail = '\xff',
-               .soft_ver = NULL,
+               .part_trail = 0xff,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -217,8 +230,8 @@ static struct device_info boards[] = {
                        "CPE210(TP-LINK|EU|N300-2|45550000):3.20\r\n"
                        "CPE210(TP-LINK|UN|N300-2|00000000):3.20\r\n"
                        "CPE210(TP-LINK|US|N300-2|55530000):3.20\r\n",
-               .support_trail = '\xff',
-               .soft_ver = NULL,
+               .part_trail = 0xff,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -258,8 +271,8 @@ static struct device_info boards[] = {
                        "CPE220(TP-LINK|UN|N300-2):2.0\r\n"
                        "CPE220(TP-LINK|EU|N300-2):2.0\r\n"
                        "CPE220(TP-LINK|US|N300-2):2.0\r\n",
-               .support_trail = '\xff',
-               .soft_ver = NULL,
+               .part_trail = 0xff,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -267,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},
@@ -298,8 +310,8 @@ static struct device_info boards[] = {
                        "CPE220(TP-LINK|UN|N300-2):3.0\r\n"
                        "CPE220(TP-LINK|EU|N300-2):3.0\r\n"
                        "CPE220(TP-LINK|US|N300-2):3.0\r\n",
-               .support_trail = '\xff',
-               .soft_ver = NULL,
+               .part_trail = 0xff,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -337,8 +349,8 @@ static struct device_info boards[] = {
                        "CPE520(TP-LINK|UN|N300-5):1.1\r\n"
                        "CPE520(TP-LINK|US|N300-5):1.1\r\n"
                        "CPE520(TP-LINK|EU|N300-5):1.1\r\n",
-               .support_trail = '\xff',
-               .soft_ver = NULL,
+               .part_trail = 0xff,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -346,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},
@@ -379,8 +390,8 @@ static struct device_info boards[] = {
                        "CPE510(TP-LINK|UN|N300-5):2.0\r\n"
                        "CPE510(TP-LINK|EU|N300-5):2.0\r\n"
                        "CPE510(TP-LINK|US|N300-5):2.0\r\n",
-               .support_trail = '\xff',
-               .soft_ver = NULL,
+               .part_trail = 0xff,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -388,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},
@@ -420,9 +430,12 @@ static struct device_info boards[] = {
                        "CPE510(TP-LINK|US|N300-5|55530000):3.0\r\n"
                        "CPE510(TP-LINK|UN|N300-5):3.0\r\n"
                        "CPE510(TP-LINK|EU|N300-5):3.0\r\n"
-                       "CPE510(TP-LINK|US|N300-5):3.0\r\n",
-               .support_trail = '\xff',
-               .soft_ver = NULL,
+                       "CPE510(TP-LINK|US|N300-5):3.0\r\n"
+                       "CPE510(TP-LINK|UN|N300-5|00000000):3.20\r\n"
+                       "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 = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -430,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},
@@ -461,8 +473,8 @@ static struct device_info boards[] = {
                        "CPE610(TP-LINK|UN|N300-5):1.0\r\n"
                        "CPE610(TP-LINK|EU|N300-5):1.0\r\n"
                        "CPE610(TP-LINK|US|N300-5):1.0\r\n",
-               .support_trail = '\xff',
-               .soft_ver = NULL,
+               .part_trail = 0xff,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -470,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},
@@ -501,8 +512,8 @@ static struct device_info boards[] = {
                        "CPE610(TP-LINK|UN|N300-5):2.0\r\n"
                        "CPE610(TP-LINK|EU|N300-5):2.0\r\n"
                        "CPE610(TP-LINK|US|N300-5):2.0\r\n",
-               .support_trail = '\xff',
-               .soft_ver = NULL,
+               .part_trail = 0xff,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -510,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},
@@ -524,6 +534,43 @@ static struct device_info boards[] = {
                .first_sysupgrade_partition = "os-image",
                .last_sysupgrade_partition = "support-list",
        },
+       /** Firmware layout for the CPE710 V1 */
+       {
+               .id     = "CPE710V1",
+               .vendor = "CPE710(TP-LINK|UN|AC866-5|00000000):1.0\r\n",
+               .support_list =
+                       "SupportList:\r\n"
+                       "CPE710(TP-LINK|UN|AC866-5|00000000):1.0\r\n"
+                       "CPE710(TP-LINK|EU|AC866-5|45550000):1.0\r\n"
+                       "CPE710(TP-LINK|US|AC866-5|55530000):1.0\r\n"
+                       "CPE710(TP-LINK|UN|AC866-5):1.0\r\n"
+                       "CPE710(TP-LINK|EU|AC866-5):1.0\r\n"
+                       "CPE710(TP-LINK|US|AC866-5):1.0\r\n",
+               .part_trail = 0xff,
+               .soft_ver = SOFT_VER_DEFAULT,
+
+               .partitions = {
+                       {"fs-uboot", 0x00000, 0x50000},
+                       {"partition-table", 0x50000, 0x02000},
+                       {"default-mac", 0x60000, 0x00020},
+                       {"serial-number", 0x60100, 0x00020},
+                       {"product-info", 0x61100, 0x00100},
+                       {"device-info", 0x61400, 0x00400},
+                       {"signature", 0x62000, 0x00400},
+                       {"device-id", 0x63000, 0x00100},
+                       {"firmware", 0x70000, 0xf40000},
+                       {"soft-version", 0xfb0000, 0x00100},
+                       {"support-list", 0xfb1000, 0x01000},
+                       {"user-config", 0xfc0000, 0x10000},
+                       {"default-config", 0xfd0000, 0x10000},
+                       {"log", 0xfe0000, 0x10000},
+                       {"radio", 0xff0000, 0x10000},
+                       {NULL, 0, 0}
+               },
+
+               .first_sysupgrade_partition = "os-image",
+               .last_sysupgrade_partition = "support-list",
+       },
 
        {
                .id     = "WBS210",
@@ -533,8 +580,8 @@ static struct device_info boards[] = {
                        "WBS210(TP-LINK|UN|N300-2):1.20\r\n"
                        "WBS210(TP-LINK|US|N300-2):1.20\r\n"
                        "WBS210(TP-LINK|EU|N300-2):1.20\r\n",
-               .support_trail = '\xff',
-               .soft_ver = NULL,
+               .part_trail = 0xff,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -542,8 +589,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},
@@ -565,8 +611,8 @@ static struct device_info boards[] = {
                        "WBS210(TP-LINK|UN|N300-2|00000000):2.0\r\n"
                        "WBS210(TP-LINK|US|N300-2|55530000):2.0\r\n"
                        "WBS210(TP-LINK|EU|N300-2|45550000):2.0\r\n",
-               .support_trail = '\xff',
-               .soft_ver = NULL,
+               .part_trail = 0xff,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -574,8 +620,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},
@@ -598,8 +643,8 @@ static struct device_info boards[] = {
                        "WBS510(TP-LINK|US|N300-5):1.20\r\n"
                        "WBS510(TP-LINK|EU|N300-5):1.20\r\n"
                        "WBS510(TP-LINK|CA|N300-5):1.20\r\n",
-               .support_trail = '\xff',
-               .soft_ver = NULL,
+               .part_trail = 0xff,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -607,8 +652,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},
@@ -631,8 +675,8 @@ static struct device_info boards[] = {
                        "WBS510(TP-LINK|US|N300-5|55530000):2.0\r\n"
                        "WBS510(TP-LINK|EU|N300-5|45550000):2.0\r\n"
                        "WBS510(TP-LINK|CA|N300-5|43410000):2.0\r\n",
-               .support_trail = '\xff',
-               .soft_ver = NULL,
+               .part_trail = 0xff,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -640,8 +684,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},
@@ -655,6 +698,50 @@ static struct device_info boards[] = {
                .last_sysupgrade_partition = "support-list",
        },
 
+       /** Firmware layout for the AD7200 */
+       {
+               .id = "AD7200",
+               .vendor = "",
+               .support_list =
+                       "SupportList:\r\n"
+                       "{product_name:AD7200,product_ver:1.0.0,special_id:00000000}\r\n",
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_DEFAULT,
+
+               .partitions = {
+                       {"SBL1", 0x00000, 0x20000},
+                       {"MIBIB", 0x20000, 0x20000},
+                       {"SBL2", 0x40000, 0x20000},
+                       {"SBL3", 0x60000, 0x30000},
+                       {"DDRCONFIG", 0x90000, 0x10000},
+                       {"SSD", 0xa0000, 0x10000},
+                       {"TZ", 0xb0000, 0x30000},
+                       {"RPM", 0xe0000, 0x20000},
+                       {"fs-uboot", 0x100000, 0x70000},
+                       {"uboot-env", 0x170000, 0x40000},
+                       {"radio", 0x1b0000, 0x40000},
+                       {"os-image", 0x1f0000, 0x400000},
+                       {"file-system", 0x5f0000, 0x1900000},
+                       {"default-mac", 0x1ef0000, 0x00200},
+                       {"pin", 0x1ef0200, 0x00200},
+                       {"device-id", 0x1ef0400, 0x00200},
+                       {"product-info", 0x1ef0600, 0x0fa00},
+                       {"partition-table", 0x1f00000, 0x10000},
+                       {"soft-version", 0x1f10000, 0x10000},
+                       {"support-list", 0x1f20000, 0x10000},
+                       {"profile", 0x1f30000, 0x10000},
+                       {"default-config", 0x1f40000, 0x10000},
+                       {"user-config", 0x1f50000, 0x40000},
+                       {"qos-db", 0x1f90000, 0x40000},
+                       {"usb-config", 0x1fd0000, 0x10000},
+                       {"log", 0x1fe0000, 0x20000},
+                       {NULL, 0, 0}
+               },
+
+               .first_sysupgrade_partition = "os-image",
+               .last_sysupgrade_partition = "file-system"
+       },
+
        /** Firmware layout for the C2600 */
        {
                .id     = "C2600",
@@ -662,8 +749,8 @@ static struct device_info boards[] = {
                .support_list =
                        "SupportList:\r\n"
                        "{product_name:Archer C2600,product_ver:1.0.0,special_id:00000000}\r\n",
-               .support_trail = '\x00',
-               .soft_ver = NULL,
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                /**
                    We use a bigger os-image partition than the stock images (and thus
@@ -712,9 +799,10 @@ static struct device_info boards[] = {
                        "{product_name:Archer A7,product_ver:5.0.0,special_id:55530000}\n"
                        "{product_name:Archer A7,product_ver:5.0.0,special_id:43410000}\n"
                        "{product_name:Archer A7,product_ver:5.0.0,special_id:4A500000}\n"
-                       "{product_name:Archer A7,product_ver:5.0.0,special_id:54570000}\n",
-               .support_trail = '\x00',
-               .soft_ver = "soft_ver:1.0.0\n",
+                       "{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_TEXT("soft_ver:1.0.0\n"),
 
                /* We're using a dynamic kernel/rootfs split here */
                .partitions = {
@@ -751,8 +839,8 @@ static struct device_info boards[] = {
                        "{product_name:ArcherC2,product_ver:3.0.0,special_id:00000000}\n"
                        "{product_name:ArcherC2,product_ver:3.0.0,special_id:55530000}\n"
                        "{product_name:ArcherC2,product_ver:3.0.0,special_id:45550000}\n",
-               .support_trail = '\x00',
-               .soft_ver = "soft_ver:3.0.1\n",
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_TEXT("soft_ver:3.0.1\n"),
 
                /** We're using a dynamic kernel/rootfs split here */
 
@@ -789,8 +877,8 @@ static struct device_info boards[] = {
                        "{product_name:ArcherC25,product_ver:1.0.0,special_id:00000000}\n"
                        "{product_name:ArcherC25,product_ver:1.0.0,special_id:55530000}\n"
                        "{product_name:ArcherC25,product_ver:1.0.0,special_id:45550000}\n",
-               .support_trail = '\x00',
-               .soft_ver = "soft_ver:1.0.0\n",
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_TEXT("soft_ver:1.0.0\n"),
 
                /* We're using a dynamic kernel/rootfs split here */
                .partitions = {
@@ -828,8 +916,8 @@ static struct device_info boards[] = {
                        "{product_name:Archer C58,product_ver:1.0.0,special_id:00000000}\r\n"
                        "{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",
-               .support_trail = '\x00',
-               .soft_ver = "soft_ver:1.0.0\n",
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_TEXT("soft_ver:1.0.0\n"),
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x10000},
@@ -863,8 +951,8 @@ static struct device_info boards[] = {
                        "{product_name:Archer C59,product_ver:1.0.0,special_id:45550000}\r\n"
                        "{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",
-               .support_trail = '\x00',
-               .soft_ver = "soft_ver:1.0.0\n",
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_TEXT("soft_ver:1.0.0\n"),
 
                /* We're using a dynamic kernel/rootfs split here */
                .partitions = {
@@ -901,8 +989,8 @@ static struct device_info boards[] = {
                        "{product_name:Archer C59,product_ver:2.0.0,special_id:00000000}\r\n"
                        "{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",
-               .support_trail = '\x00',
-               .soft_ver = "soft_ver:2.0.0 Build 20161206 rel.7303\n",
+               .part_trail = 0x00,
+               .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 = {
@@ -941,8 +1029,8 @@ static struct device_info boards[] = {
                        "{product_name:Archer C6,product_ver:2.0.0,special_id:45550000}\r\n"
                        "{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",
-               .support_trail = '\x00',
-               .soft_ver = "soft_ver:1.9.1\n",
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_TEXT("soft_ver:1.9.1\n"),
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -976,8 +1064,8 @@ static struct device_info boards[] = {
                        "{product_name:Archer A6,product_ver:2.0.0,special_id:55530000}\n"
                        "{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",
-               .support_trail = '\x00',
-               .soft_ver = "soft_ver:1.9.1\n",
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_TEXT("soft_ver:1.9.1\n"),
 
                .partitions = {
                        {"factory-boot", 0x00000, 0x20000},
@@ -1001,7 +1089,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",
@@ -1011,8 +1212,8 @@ static struct device_info boards[] = {
                        "{product_name:Archer C60,product_ver:1.0.0,special_id:00000000}\r\n"
                        "{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",
-               .support_trail = '\x00',
-               .soft_ver = "soft_ver:1.0.0\n",
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_TEXT("soft_ver:1.0.0\n"),
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x10000},
@@ -1045,8 +1246,8 @@ static struct device_info boards[] = {
                        "{product_name:Archer C60,product_ver:2.0.0,special_id:42520000}\r\n"
                        "{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",
-               .support_trail = '\x00',
-               .soft_ver = "soft_ver:2.0.0\n",
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_TEXT("soft_ver:2.0.0\n"),
 
                .partitions = {
                        {"factory-boot", 0x00000, 0x1fb00},
@@ -1081,8 +1282,8 @@ static struct device_info boards[] = {
                        "{product_name:Archer C60,product_ver:3.0.0,special_id:42520000}\r\n"
                        "{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",
-               .support_trail = '\x00',
-               .soft_ver = "soft_ver:3.0.0\n",
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_TEXT("soft_ver:3.0.0\n"),
 
                .partitions = {
                        {"factory-boot", 0x00000, 0x1fb00},
@@ -1117,8 +1318,8 @@ static struct device_info boards[] = {
                        "{product_name:ArcherC5,product_ver:2.0.0,special_id:00000000}\r\n"
                        "{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 */
-               .support_trail = '\x00',
-               .soft_ver = NULL,
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x40000},
@@ -1158,8 +1359,8 @@ static struct device_info boards[] = {
                        "{product_name:Archer C7,product_ver:4.0.0,special_id:54570000}\n"
                        "{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",
-               .support_trail = '\x00',
-               .soft_ver = "soft_ver:1.0.0\n",
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_TEXT("soft_ver:1.0.0\n"),
 
                /* We're using a dynamic kernel/rootfs split here */
                .partitions = {
@@ -1203,8 +1404,8 @@ static struct device_info boards[] = {
                        "{product_name:Archer C7,product_ver:5.0.0,special_id:52550000}\n"
                        "{product_name:Archer C7,product_ver:5.0.0,special_id:4B520000}\n",
 
-               .support_trail = '\x00',
-               .soft_ver = "soft_ver:1.0.0\n",
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_TEXT("soft_ver:7.0.0\n"),
 
                /* We're using a dynamic kernel/rootfs split here */
                .partitions = {
@@ -1246,8 +1447,8 @@ static struct device_info boards[] = {
                        "{product_name:ArcherC9,"
                        "product_ver:1.0.0,"
                        "special_id:00000000}\n",
-               .support_trail = '\x00',
-               .soft_ver = NULL,
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x40000},
@@ -1279,8 +1480,8 @@ static struct device_info boards[] = {
                .support_list =
                        "SupportList:\r\n"
                        "EAP120(TP-LINK|UN|N300-2):1.0\r\n",
-               .support_trail = '\xff',
-               .soft_ver = NULL,
+               .part_trail = 0xff,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -1308,8 +1509,8 @@ static struct device_info boards[] = {
                .support_list =
                        "SupportList:\r\n"
                        "EAP225-Outdoor(TP-Link|UN|AC1200-D):1.0\r\n",
-               .support_trail = '\xff',
-               .soft_ver = NULL,
+               .part_trail = PART_TRAIL_NONE,
+               .soft_ver = SOFT_VER_DEFAULT,
                .soft_ver_compat_level = 1,
 
                .partitions = {
@@ -1337,8 +1538,8 @@ static struct device_info boards[] = {
                .support_list =
                        "SupportList:\r\n"
                        "EAP225(TP-Link|UN|AC1350-D):3.0\r\n",
-               .support_trail = '\xff',
-               .soft_ver = NULL,
+               .part_trail = PART_TRAIL_NONE,
+               .soft_ver = SOFT_VER_DEFAULT,
                .soft_ver_compat_level = 1,
 
                .partitions = {
@@ -1366,8 +1567,8 @@ static struct device_info boards[] = {
                .support_list =
                        "SupportList:\r\n"
                        "EAP225-Wall(TP-Link|UN|AC1200-D):2.0\r\n",
-               .support_trail = '\xff',
-               .soft_ver = NULL,
+               .part_trail = PART_TRAIL_NONE,
+               .soft_ver = SOFT_VER_DEFAULT,
                .soft_ver_compat_level = 1,
 
                .partitions = {
@@ -1389,14 +1590,43 @@ static struct device_info boards[] = {
                .last_sysupgrade_partition = "file-system"
        },
 
+       /** Firmware layout for the EAP235-Wall v1 */
+       {
+               .id     = "EAP235-WALL-V1",
+               .support_list =
+                       "SupportList:\r\n"
+                       "EAP235-Wall(TP-Link|UN|AC1200-D):1.0\r\n",
+               .part_trail = PART_TRAIL_NONE,
+               .soft_ver = SOFT_VER_NUMERIC(3, 0, 0),
+               .soft_ver_compat_level = 1,
+
+               .partitions = {
+                       {"fs-uboot", 0x00000, 0x80000},
+                       {"partition-table", 0x80000, 0x02000},
+                       {"default-mac", 0x90000, 0x01000},
+                       {"support-list", 0x91000, 0x00100},
+                       {"product-info", 0x91100, 0x00400},
+                       {"soft-version", 0x92000, 0x00100},
+                       {"firmware", 0xa0000, 0xd20000},
+                       {"user-config", 0xdc0000, 0x30000},
+                       {"mutil-log", 0xf30000, 0x80000},
+                       {"oops", 0xfb0000, 0x40000},
+                       {"radio", 0xff0000, 0x10000},
+                       {NULL, 0, 0}
+               },
+
+               .first_sysupgrade_partition = "os-image",
+               .last_sysupgrade_partition = "file-system"
+       },
+
        /** Firmware layout for the EAP245 v1 */
        {
                .id     = "EAP245-V1",
                .support_list =
                        "SupportList:\r\n"
                        "EAP245(TP-LINK|UN|AC1750-D):1.0\r\n",
-               .support_trail = '\xff',
-               .soft_ver = NULL,
+               .part_trail = PART_TRAIL_NONE,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -1421,8 +1651,8 @@ static struct device_info boards[] = {
                .support_list =
                        "SupportList:\r\n"
                        "EAP245(TP-Link|UN|AC1750-D):3.0\r\n",
-               .support_trail = '\xff',
-               .soft_ver = NULL,
+               .part_trail = PART_TRAIL_NONE,
+               .soft_ver = SOFT_VER_DEFAULT,
                .soft_ver_compat_level = 1,
 
                /** Firmware partition with dynamic kernel/rootfs split */
@@ -1447,6 +1677,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",
@@ -1463,8 +1735,8 @@ static struct device_info boards[] = {
                        "{product_name:TL-WA850RE,product_ver:2.0.0,special_id:43410000}\n"
                        "{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",
-               .support_trail = '\x00',
-               .soft_ver = NULL,
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                /**
                   576KB were moved from file-system to os-image
@@ -1505,8 +1777,8 @@ static struct device_info boards[] = {
                        "{product_name:TL-WA855RE,product_ver:1.0.0,special_id:43410000}\n"
                        "{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",
-               .support_trail = '\x00',
-               .soft_ver = NULL,
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -1536,8 +1808,8 @@ static struct device_info boards[] = {
                .support_list =
                        "SupportList:\n"
                        "{product_name:TL-WPA8630P,product_ver:2.0.0,special_id:45550000}\n",
-               .support_trail = '\x00',
-               .soft_ver = NULL,
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"factory-uboot", 0x00000, 0x20000},
@@ -1573,8 +1845,8 @@ static struct device_info boards[] = {
                        "{product_name:TL-WPA8630P,product_ver:2.0.0,special_id:41550000}\n"
                        "{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",
-               .support_trail = '\x00',
-               .soft_ver = NULL,
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"factory-uboot", 0x00000, 0x20000},
@@ -1608,8 +1880,8 @@ static struct device_info boards[] = {
                .support_list =
                        "SupportList:\n"
                        "{product_name:TL-WPA8630P,product_ver:2.1.0,special_id:45550000}\n",
-               .support_trail = '\x00',
-               .soft_ver = NULL,
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"factory-uboot", 0x00000, 0x20000},
@@ -1644,8 +1916,8 @@ static struct device_info boards[] = {
                        "SupportList:\n"
                        "{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",
-               .support_trail = '\x00',
-               .soft_ver = "soft_ver:1.0.0\n",
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_TEXT("soft_ver:1.0.0\n"),
                .partitions = {
                        {"factory-boot", 0x00000, 0x20000},
                        {"fs-uboot", 0x20000, 0x20000},
@@ -1678,8 +1950,8 @@ static struct device_info boards[] = {
                .support_list =
                        "SupportList:\n"
                        "{product_name:TL-WR1043ND,product_ver:4.0.0,special_id:45550000}\n",
-               .support_trail = '\x00',
-               .soft_ver = NULL,
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                /* We're using a dynamic kernel/rootfs split here */
                .partitions = {
@@ -1711,8 +1983,8 @@ static struct device_info boards[] = {
                        "SupportList:\n"
                        "{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",
-               .support_trail = '\x00',
-               .soft_ver = NULL,
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                /**
                   384KB were moved from file-system to os-image
@@ -1739,6 +2011,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",
@@ -1747,8 +2050,8 @@ static struct device_info boards[] = {
                        "SupportList:\r\n"
                        "{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",
-               .support_trail = '\x00',
-               .soft_ver = NULL,
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -1794,8 +2097,8 @@ static struct device_info boards[] = {
                        "{product_name:RE200,product_ver:2.0.0,special_id:52550000}\n"
                        "{product_name:RE200,product_ver:2.0.0,special_id:54570000}\n"
                        "{product_name:RE200,product_ver:2.0.0,special_id:55530000}\n",
-               .support_trail = '\x00',
-               .soft_ver = NULL,
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -1838,8 +2141,8 @@ static struct device_info boards[] = {
                        "{product_name:RE200,product_ver:3.0.0,special_id:52550000}\n"
                        "{product_name:RE200,product_ver:3.0.0,special_id:54570000}\n"
                        "{product_name:RE200,product_ver:3.0.0,special_id:55530000}\n",
-               .support_trail = '\x00',
-               .soft_ver = NULL,
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -1882,8 +2185,8 @@ static struct device_info boards[] = {
                        "{product_name:RE200,product_ver:4.0.0,special_id:45530000}\n"
                        "{product_name:RE200,product_ver:4.0.0,special_id:49440000}\n"
                        "{product_name:RE200,product_ver:4.0.0,special_id:45470000}\n",
-               .support_trail = '\x00',
-               .soft_ver = "soft_ver:1.1.0\n",
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_TEXT("soft_ver:1.1.0\n"),
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -1925,8 +2228,8 @@ static struct device_info boards[] = {
                        "{product_name:RE220,product_ver:2.0.0,special_id:52550000}\n"
                        "{product_name:RE220,product_ver:2.0.0,special_id:54570000}\n"
                        "{product_name:RE220,product_ver:2.0.0,special_id:55530000}\n",
-               .support_trail = '\x00',
-               .soft_ver = NULL,
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -1962,8 +2265,8 @@ static struct device_info boards[] = {
                        "{product_name:RE305,product_ver:1.0.0,special_id:4b520000}\n"
                        "{product_name:RE305,product_ver:1.0.0,special_id:41550000}\n"
                        "{product_name:RE305,product_ver:1.0.0,special_id:43410000}\n",
-               .support_trail = '\x00',
-               .soft_ver = NULL,
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -1998,8 +2301,8 @@ static struct device_info boards[] = {
                        "{product_name:RE350,product_ver:1.0.0,special_id:43410000}\n"
                        "{product_name:RE350,product_ver:1.0.0,special_id:4b520000}\n"
                        "{product_name:RE350,product_ver:1.0.0,special_id:4a500000}\n",
-               .support_trail = '\x00',
-               .soft_ver = NULL,
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                /** We're using a dynamic kernel/rootfs split here */
                .partitions = {
@@ -2029,8 +2332,8 @@ static struct device_info boards[] = {
                .support_list =
                        "SupportList:\n"
                        "{product_name:RE350K,product_ver:1.0.0,special_id:00000000,product_region:US}\n",
-               .support_trail = '\x00',
-               .soft_ver = NULL,
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                /** We're using a dynamic kernel/rootfs split here */
                .partitions = {
@@ -2068,8 +2371,8 @@ static struct device_info boards[] = {
                        "{product_name:RE355,product_ver:1.0.0,special_id:41550000}\r\n"
                        "{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",
-               .support_trail = '\x00',
-               .soft_ver = NULL,
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                /* We're using a dynamic kernel/rootfs split here */
                .partitions = {
@@ -2106,8 +2409,8 @@ static struct device_info boards[] = {
                        "{product_name:RE450,product_ver:1.0.0,special_id:41550000}\r\n"
                        "{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",
-               .support_trail = '\x00',
-               .soft_ver = NULL,
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                /** We're using a dynamic kernel/rootfs split here */
                .partitions = {
@@ -2145,8 +2448,8 @@ static struct device_info boards[] = {
                        "{product_name:RE450,product_ver:2.0.0,special_id:41530000}\r\n"
                        "{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",
-               .support_trail = '\x00',
-               .soft_ver = NULL,
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                /* We're using a dynamic kernel/rootfs split here */
                .partitions = {
@@ -2184,8 +2487,48 @@ static struct device_info boards[] = {
                        "{product_name:RE450,product_ver:3.0.0,special_id:41530000}\r\n"
                        "{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",
-               .support_trail = '\x00',
-               .soft_ver = NULL,
+               .part_trail = 0x00,
+               .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 = {
@@ -2222,8 +2565,8 @@ static struct device_info boards[] = {
                        "{product_name:RE500,product_ver:1.0.0,special_id:43410000}\r\n"
                        "{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",
-               .support_trail = '\x00',
-               .soft_ver = NULL,
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                /* We're using a dynamic kernel/rootfs split here */
                .partitions = {
@@ -2259,8 +2602,8 @@ static struct device_info boards[] = {
                        "{product_name:RE650,product_ver:1.0.0,special_id:43410000}\r\n"
                        "{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",
-               .support_trail = '\x00',
-               .soft_ver = NULL,
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                /* We're using a dynamic kernel/rootfs split here */
                .partitions = {
@@ -2303,15 +2646,23 @@ static inline void put32(uint8_t *buf, uint32_t val) {
        buf[3] = val;
 }
 
+static inline bool meta_partition_should_pad(enum partition_trail_value pv)
+{
+       return (pv >= 0) && (pv <= PART_TRAIL_MAX);
+}
+
 /** Allocate a padded meta partition with a correctly initialised header
  * If the `data` pointer is NULL, then the required space is only allocated,
  * otherwise `data_len` bytes will be copied from `data` into the partition
  * entry. */
 static struct image_partition_entry init_meta_partition_entry(
        const char *name, const void *data, uint32_t data_len,
-       uint8_t pad_value)
+       enum partition_trail_value pad_value)
 {
-       uint32_t total_len = sizeof(struct meta_header) + data_len + 1;
+       uint32_t total_len = sizeof(struct meta_header) + data_len;
+       if (meta_partition_should_pad(pad_value))
+               total_len += 1;
+
        struct image_partition_entry entry = {
                .name = name,
                .size = total_len,
@@ -2327,7 +2678,8 @@ static struct image_partition_entry init_meta_partition_entry(
        if (data)
                memcpy(entry.data+sizeof(*header), data, data_len);
 
-       entry.data[total_len - 1] = pad_value;
+       if (meta_partition_should_pad(pad_value))
+               entry.data[total_len - 1] = (uint8_t) pad_value;
 
        return entry;
 }
@@ -2402,10 +2754,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, 0);
+                       info->soft_ver.text, len, info->part_trail);
        }
 
        time_t t;
@@ -2420,24 +2772,26 @@ 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)
        };
 
        if (info->soft_ver_compat_level == 0)
                return init_meta_partition_entry("soft-version", &s,
-                       (uint8_t *)(&s.compat_level) - (uint8_t *)(&s), 0xff);
+                       (uint8_t *)(&s.compat_level) - (uint8_t *)(&s),
+                       info->part_trail);
        else
                return init_meta_partition_entry("soft-version", &s,
-                       sizeof(s), 0xff);
+                       sizeof(s), info->part_trail);
 }
 
 /** Generates the support-list partition */
@@ -2446,14 +2800,15 @@ static struct image_partition_entry make_support_list(
 {
        uint32_t len = strlen(info->support_list);
        return init_meta_partition_entry("support-list", info->support_list,
-               len, info->support_trail);
+               len, info->part_trail);
 }
 
 /** Partition with extra-para data */
 static struct image_partition_entry make_extra_para(
        const struct device_info *info, const uint8_t *extra_para, size_t len)
 {
-       return init_meta_partition_entry("extra-para", extra_para, len, 0x00);
+       return init_meta_partition_entry("extra-para", extra_para, len,
+               info->part_trail);
 }
 
 /** Creates a new image partition with an arbitrary name from a file */
@@ -2726,7 +3081,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 ||
@@ -2734,11 +3090,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));
@@ -2779,6 +3138,8 @@ static void usage(const char *argv0) {
                "Options:\n"
                "  -h              show this help\n"
                "\n"
+               "Info about an image:\n"
+               "  -i <file>       input file to read from\n"
                "Create a new image:\n"
                "  -B <board>      create image for the board specified with <board>\n"
                "  -k <file>       read kernel image from the file <file>\n"
@@ -3043,10 +3404,124 @@ static struct flash_partition_entry *find_partition(
                        return entries;
        }
 
-       error(1, 0, "%s", error_msg);
+       if (error_msg) {
+               error(1, 0, "%s", error_msg);
+       }
+
        return NULL;
 }
 
+static int firmware_info(const char *input)
+{
+       struct flash_partition_entry pointers[MAX_PARTITIONS] = { };
+       struct flash_partition_entry *e;
+       FILE *fp;
+       int i;
+
+       fp = fopen(input, "r");
+
+       if (read_partition_table(fp, 0x1014, pointers, MAX_PARTITIONS, 0)) {
+               error(1, 0, "Error can not read the partition table (fwup-ptn)");
+       }
+
+       printf("Firmware image partitions:\n");
+       printf("%-8s %-8s %s\n", "base", "size", "name");
+       for (i = 0; i < MAX_PARTITIONS; i++) {
+               e = &pointers[i];
+
+               if (!e->name && !e->base && !e->size)
+                       continue;
+
+               printf("%08x %08x %s\n", e->base, e->size, e->name ? e->name : "");
+       }
+
+       e = find_partition(pointers, MAX_PARTITIONS, "soft-version", NULL);
+       if (e) {
+               size_t data_len = e->size - sizeof(struct meta_header);
+               char *buf = malloc(data_len);
+               struct soft_version *s;
+               bool isstr;
+               int i;
+
+               if (!buf)
+                       error(1, errno, "Failed to alloc buffer");
+
+               if (fseek(fp, 0x1014 + e->base + sizeof(struct meta_header), SEEK_SET))
+                       error(1, errno, "Can not seek in the firmware");
+
+               if (fread(buf, data_len, 1, fp) != 1)
+                       error(1, errno, "Can not read fwup-ptn data from the firmware");
+
+               /* Check for string ignoring padding character */
+               isstr = true;
+               for (i = 0; i < data_len - 1; i++) {
+                       if (!isascii(buf[i])) {
+                               isstr = false;
+                               break;
+                       }
+               }
+
+               printf("\n[Software version]\n");
+               if (isstr) {
+                       fwrite(buf, data_len, 1, stdout);
+                       putchar('\n');
+               } else if (data_len >= offsetof(struct soft_version, rev)) {
+                       s = (struct soft_version *)buf;
+
+                       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");
+               }
+
+               free(buf);
+       }
+
+       e = find_partition(pointers, MAX_PARTITIONS, "support-list", NULL);
+       if (e) {
+               char buf[128];
+               size_t length;
+               size_t bytes;
+
+               if (fseek(fp, 0x1014 + e->base + sizeof(struct meta_header), SEEK_SET))
+                       error(1, errno, "Can not seek in the firmware");
+
+               printf("\n[Support list]\n");
+               for (length = e->size - sizeof(struct meta_header); length; length -= bytes) {
+                       bytes = fread(buf, 1, length > sizeof(buf) ? sizeof(buf) : length, fp);
+                       if (bytes <= 0)
+                               error(1, errno, "Can not read fwup-ptn data from the firmware");
+
+                       puts(buf);
+               }
+       }
+
+       e = find_partition(pointers, MAX_PARTITIONS, "partition-table", NULL);
+       if (e) {
+               struct flash_partition_entry parts[MAX_PARTITIONS] = { };
+
+               if (read_partition_table(fp, 0x1014 + e->base + 4, parts, MAX_PARTITIONS, 1)) {
+                       error(1, 0, "Error can not read the partition table (partition)");
+               }
+
+               printf("\n[Partition table]\n");
+               printf("%-8s %-8s %s\n", "base", "size", "name");
+               for (i = 0; i < MAX_PARTITIONS; i++) {
+                       e = &parts[i];
+
+                       if (!e->name && !e->base && !e->size)
+                               continue;
+
+                       printf("%08x %08x %s\n", e->base, e->size, e->name ? e->name : "");
+               }
+       }
+
+       fclose(fp);
+
+       return 0;
+}
+
 static void write_ff(FILE *output_file, size_t size)
 {
        char buf[4096];
@@ -3126,7 +3601,7 @@ static void convert_firmware(const char *input, const char *output)
 }
 
 int main(int argc, char *argv[]) {
-       const char *board = NULL, *kernel_image = NULL, *rootfs_image = NULL, *output = NULL;
+       const char *info_image = NULL, *board = NULL, *kernel_image = NULL, *rootfs_image = NULL, *output = NULL;
        const char *extract_image = NULL, *output_directory = NULL, *convert_image = NULL;
        bool add_jffs2_eof = false, sysupgrade = false;
        unsigned rev = 0;
@@ -3136,11 +3611,15 @@ int main(int argc, char *argv[]) {
        while (true) {
                int c;
 
-               c = getopt(argc, argv, "B:k:r:o:V:jSh:x:d:z:");
+               c = getopt(argc, argv, "i:B:k:r:o:V:jSh:x:d:z:");
                if (c == -1)
                        break;
 
                switch (c) {
+               case 'i':
+                       info_image = optarg;
+                       break;
+
                case 'B':
                        board = optarg;
                        break;
@@ -3191,7 +3670,9 @@ int main(int argc, char *argv[]) {
                }
        }
 
-       if (extract_image || output_directory) {
+       if (info_image) {
+               firmware_info(info_image);
+       } else if (extract_image || output_directory) {
                if (!extract_image)
                        error(1, 0, "No factory/oem image given via -x <file>. Output directory is only valid with -x");
                if (!output_directory)