tplink-safeloader: replace hardcoded offsets
[project/firmware-utils.git] / src / tplink-safeloader.c
index 432044882c1d0a1554b568262e15e5db47c76df0..0a6327b0d265cfe381180414b5477d0e5d9800b0 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.
 */
 
 
@@ -67,11 +48,21 @@ struct image_partition_entry {
 
 /** A flash partition table entry */
 struct flash_partition_entry {
-       char *name;
+       const char *name;
        uint32_t base;
        uint32_t size;
 };
 
+/** Flash partition names table entry */
+struct factory_partition_names {
+       const char *partition_table;
+       const char *soft_ver;
+       const char *os_image;
+       const char *support_list;
+       const char *file_system;
+       const char *extra_para;
+};
+
 /** Partition trailing padding definitions
  * Values 0x00 to 0xff are reserved to indicate the padding value
  * Values from 0x100 are reserved to indicate other behaviour */
@@ -82,19 +73,41 @@ 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;
+       struct factory_partition_names partition_names;
 };
 
+#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;
@@ -114,6 +127,11 @@ struct __attribute__((__packed__)) soft_version {
        uint32_t compat_level;
 };
 
+#define SAFELOADER_PREAMBLE_SIZE       0x14
+#define SAFELOADER_HEADER_SIZE         0x1000
+#define SAFELOADER_PAYLOAD_OFFSET      (SAFELOADER_PREAMBLE_SIZE + SAFELOADER_HEADER_SIZE)
+
+#define SAFELOADER_PAYLOAD_TABLE_SIZE  0x800
 
 static const uint8_t jffs2_eof_mark[4] = {0xde, 0xad, 0xc0, 0xde};
 
@@ -148,7 +166,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},
@@ -187,7 +205,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},
@@ -229,7 +247,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},
@@ -270,7 +288,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},
@@ -309,7 +327,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},
@@ -348,7 +366,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},
@@ -389,7 +407,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},
@@ -433,7 +451,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},
@@ -455,6 +473,41 @@ static struct device_info boards[] = {
                .last_sysupgrade_partition = "support-list",
        },
 
+       /** Firmware layout for the CPE605V1 */
+       {
+               .id     = "CPE605V1",
+               .vendor = "CPE605(TP-LINK|UN|N150-5):1.0\r\n",
+               .support_list =
+                       "SupportList:\r\n"
+                       "CPE605(TP-LINK|UN|N150-5|00000000):1.0\r\n"
+                       "CPE605(TP-LINK|EU|N150-5|45550000):1.0\r\n"
+                       "CPE605(TP-LINK|US|N150-5|55530000):1.0\r\n",
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_DEFAULT,
+
+               .partitions = {
+                       {"fs-uboot", 0x00000, 0x20000},
+                       {"partition-table", 0x20000, 0x02000},
+                       {"default-mac", 0x30000, 0x00020},
+                       {"serial-number", 0x30100, 0x00020},
+                       {"product-info", 0x31100, 0x00100},
+                       {"device-info", 0x31400, 0x00400},
+                       {"signature", 0x32000, 0x00400},
+                       {"device-id", 0x33000, 0x00100},
+                       {"firmware", 0x40000, 0x770000},
+                       {"soft-version", 0x7b0000, 0x00100},
+                       {"support-list", 0x7b1000, 0x01000},
+                       {"user-config", 0x7c0000, 0x10000},
+                       {"default-config", 0x7d0000, 0x10000},
+                       {"log", 0x7e0000, 0x10000},
+                       {"radio", 0x7f0000, 0x10000},
+                       {NULL, 0, 0}
+               },
+
+               .first_sysupgrade_partition = "os-image",
+               .last_sysupgrade_partition = "support-list",
+       },
+
        /** Firmware layout for the CPE610V1 */
        {
                .id     = "CPE610V1",
@@ -472,7 +525,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},
@@ -511,7 +564,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},
@@ -532,6 +585,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",
@@ -542,7 +632,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},
@@ -573,7 +663,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},
@@ -605,7 +695,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},
@@ -637,7 +727,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},
@@ -667,7 +757,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},
@@ -711,7 +801,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
@@ -763,7 +853,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:7.0.0\n"),
 
                /* We're using a dynamic kernel/rootfs split here */
                .partitions = {
@@ -792,6 +882,49 @@ static struct device_info boards[] = {
                .last_sysupgrade_partition = "file-system",
        },
 
+       /** Firmware layout for the Archer A9 v6 */
+       {
+               .id     = "ARCHER-A9-V6",
+               .support_list =
+                       "SupportList:\n"
+                       "{product_name:Archer A9,product_ver:6.0,special_id:55530000}\n"
+                       "{product_name:Archer A9,product_ver:6.0,special_id:45550000}\n"
+                       "{product_name:Archer A9,product_ver:6.0,special_id:52550000}\n"
+                       "{product_name:Archer A9,product_ver:6.0,special_id:4A500000}\n"
+                       "{product_name:Archer C90,product_ver:6.0,special_id:55530000}\n",
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_TEXT("soft_ver:1.1.0\n"),
+
+               /* We're using a dynamic kernel/rootfs split here */
+               .partitions = {
+                       {"factory-boot", 0x00000, 0x20000},
+                       {"fs-uboot", 0x20000, 0x20000},
+                       {"partition-table", 0x40000, 0x10000},
+                       {"radio", 0x50000, 0x10000},
+                       {"default-mac", 0x60000, 0x00200},
+                       {"pin", 0x60200, 0x00200},
+                       {"device-id", 0x60400, 0x00100},
+                       {"product-info", 0x60500, 0x0fb00},
+                       {"soft-version", 0x70000, 0x01000},
+                       {"extra-para", 0x71000, 0x01000},
+                       {"support-list", 0x72000, 0x0a000},
+                       {"profile", 0x7c000, 0x04000},
+                       {"user-config", 0x80000, 0x10000},
+                       {"ap-config", 0x90000, 0x10000},
+                       {"apdef-config", 0xa0000, 0x10000},
+                       {"router-config", 0xb0000, 0x10000},
+                       {"firmware", 0xc0000, 0xf00000},        /* Stock: name os-image base 0xc0000 size 0x120000 */
+                                                               /* Stock: name file-system base 0x1e0000 size 0xde0000 */
+                       {"log", 0xfc0000, 0x20000},
+                       {"certificate", 0xfe0000, 0x10000},
+                       {"default-config", 0xff0000, 0x10000},
+                       {NULL, 0, 0}
+               },
+
+               .first_sysupgrade_partition = "os-image",
+               .last_sysupgrade_partition = "file-system",
+       },
+
        /** Firmware layout for the C2v3 */
        {
                .id     = "ARCHER-C2-V3",
@@ -801,7 +934,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 */
 
@@ -839,7 +972,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 = {
@@ -878,7 +1011,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},
@@ -913,7 +1046,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 = {
@@ -951,7 +1084,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 = {
@@ -987,11 +1120,12 @@ static struct device_info boards[] = {
                .vendor = "",
                .support_list =
                        "SupportList:\r\n"
+                       "{product_name:Archer A6,product_ver:2.0.0,special_id:45550000}\r\n"
                        "{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",
                .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},
@@ -1026,7 +1160,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},
@@ -1060,9 +1194,10 @@ static struct device_info boards[] = {
                        "{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}",
+                       "{product_name:Archer C6,product_ver:3.20,special_id:4B520000}"
+                       "{product_name:Archer C6,product_ver:3.0.0,special_id:42520000}",
                .part_trail = 0x00,
-               .soft_ver = "soft_ver:1.0.9\n",
+               .soft_ver = SOFT_VER_TEXT("soft_ver:1.0.9\n"),
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x40000},
@@ -1099,9 +1234,10 @@ static struct device_info boards[] = {
                        "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",
+                       "{product_name:Archer A6,product_ver:3.0.0,special_id:54570000}\n"
+                       "{product_name:Archer A6,product_ver:3.0.0,special_id:4A500000}\n",
                .part_trail = 0x00,
-               .soft_ver = "soft_ver:1.0.5\n",
+               .soft_ver = SOFT_VER_TEXT("soft_ver:1.0.5\n"),
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x40000},
@@ -1138,7 +1274,7 @@ static struct device_info boards[] = {
                        "SupportList:\n"
                        "{product_name:Archer C6U,product_ver:1.0.0,special_id:45550000}\n",
                .part_trail = 0x00,
-               .soft_ver = "soft_ver:1.0.2\n",
+               .soft_ver = SOFT_VER_TEXT("soft_ver:1.0.2\n"),
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x40000},
@@ -1174,7 +1310,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},
@@ -1208,7 +1344,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},
@@ -1244,7 +1380,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},
@@ -1280,7 +1416,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},
@@ -1321,7 +1457,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 = {
@@ -1366,7 +1502,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 = {
@@ -1409,7 +1545,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},
@@ -1434,6 +1570,132 @@ static struct device_info boards[] = {
                .last_sysupgrade_partition = "file-system"
        },
 
+       /** Firmware layout for the Deco M4R v1 and v2 */
+       {
+               .id     = "DECO-M4R-V1",
+               .vendor = "",
+               .support_list =
+                       "SupportList:\n"
+                       "{product_name:M4R,product_ver:1.0.0,special_id:55530000}\n"
+                       "{product_name:M4R,product_ver:1.0.0,special_id:45550000}\n"
+                       "{product_name:M4R,product_ver:1.0.0,special_id:43410000}\n"
+                       "{product_name:M4R,product_ver:1.0.0,special_id:4A500000}\n"
+                       "{product_name:M4R,product_ver:1.0.0,special_id:41550000}\n"
+                       "{product_name:M4R,product_ver:1.0.0,special_id:4B520000}\n"
+                       "{product_name:M4R,product_ver:1.0.0,special_id:49440000}\n"
+                       "{product_name:M4R,product_ver:2.0.0,special_id:55530000}\n"
+                       "{product_name:M4R,product_ver:2.0.0,special_id:45550000}\n"
+                       "{product_name:M4R,product_ver:2.0.0,special_id:43410000}\n"
+                       "{product_name:M4R,product_ver:2.0.0,special_id:4A500000}\n"
+                       "{product_name:M4R,product_ver:2.0.0,special_id:41550000}\n"
+                       "{product_name:M4R,product_ver:2.0.0,special_id:4B520000}\n"
+                       "{product_name:M4R,product_ver:2.0.0,special_id:54570000}\n"
+                       "{product_name:M4R,product_ver:2.0.0,special_id:42340000}\n"
+                       "{product_name:M4R,product_ver:2.0.0,special_id:49440000}\n",
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_DEFAULT,
+
+               .partitions = {
+                       {"fs-uboot", 0x00000, 0x80000},
+                       {"firmware", 0x80000, 0xe00000},
+                       {"product-info", 0xe80000, 0x05000},
+                       {"default-mac", 0xe85000, 0x01000},
+                       {"device-id", 0xe86000, 0x01000},
+                       {"support-list", 0xe87000, 0x10000},
+                       {"user-config", 0xea7000, 0x10000},
+                       {"device-config", 0xeb7000, 0x10000},
+                       {"group-info", 0xec7000, 0x10000},
+                       {"partition-table", 0xed7000, 0x02000},
+                       {"soft-version", 0xed9000, 0x10000},
+                       {"profile", 0xee9000, 0x10000},
+                       {"default-config", 0xef9000, 0x10000},
+                       {"url-sig", 0xfe0000, 0x10000},
+                       {"radio", 0xff0000, 0x10000},
+                       {NULL, 0, 0}
+               },
+               .first_sysupgrade_partition = "os-image",
+               .last_sysupgrade_partition = "file-system",
+       },
+
+       /** Firmware layout for the Deco M4R v4 */
+       {
+               .id     = "DECO-M4R-V4",
+               .vendor = "",
+               .support_list =
+                       "SupportList:\n"
+                       "{product_name:M4R,product_ver:4.0.0,special_id:55530000}\n"
+                       "{product_name:M4R,product_ver:4.0.0,special_id:45550000}\n"
+                       "{product_name:M4R,product_ver:4.0.0,special_id:4A500000}\n"
+                       "{product_name:M4R,product_ver:4.0.0,special_id:42340000}\n"
+                       "{product_name:M4R,product_ver:4.0.0,special_id:5A470000}\n",
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_TEXT("soft_ver:1.0.0\n"),
+
+               .partitions = {
+                       {"fs-uboot", 0x00000, 0x40000},
+                       {"firmware", 0x40000, 0xf60000},
+                       {"default-mac", 0xfa0000, 0x00300},
+                       {"device-id", 0xfa0300, 0x00100},
+                       {"product-info", 0xfa0400, 0x0fc00},
+                       {"group-info", 0xfb0000, 0x04000},
+                       {"user-config", 0xfb4000, 0x0c000},
+                       {"device-config", 0xfc0000, 0x10000},
+                       {"default-config", 0xfd0000, 0x10000},
+                       {"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 Deco S4 v2 */
+       {
+               .id     = "DECO-S4-V2",
+               .vendor = "",
+               .support_list =
+                       "SupportList:\n"
+                       "{product_name:S4,product_ver:1.0.0,special_id:55530000}\n"
+                       "{product_name:S4,product_ver:1.0.0,special_id:45550000}\n"
+                       "{product_name:S4,product_ver:1.0.0,special_id:43410000}\n"
+                       "{product_name:S4,product_ver:1.0.0,special_id:4A500000}\n"
+                       "{product_name:S4,product_ver:1.0.0,special_id:41550000}\n"
+                       "{product_name:S4,product_ver:1.0.0,special_id:4B520000}\n"
+                       "{product_name:S4,product_ver:2.0.0,special_id:55530000}\n"
+                       "{product_name:S4,product_ver:2.0.0,special_id:45550000}\n"
+                       "{product_name:S4,product_ver:2.0.0,special_id:43410000}\n"
+                       "{product_name:S4,product_ver:2.0.0,special_id:4A500000}\n"
+                       "{product_name:S4,product_ver:2.0.0,special_id:41550000}\n"
+                       "{product_name:S4,product_ver:2.0.0,special_id:4B520000}\n",
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_DEFAULT,
+
+               .partitions = {
+                       {"fs-uboot", 0x00000, 0x80000},
+                       {"product-info", 0x80000, 0x05000},
+                       {"default-mac", 0x85000, 0x01000},
+                       {"device-id", 0x86000, 0x01000},
+                       {"support-list", 0x87000, 0x10000},
+                       {"user-config", 0xa7000, 0x10000},
+                       {"device-config", 0xb7000, 0x10000},
+                       {"group-info", 0xc7000, 0x10000},
+                       {"partition-table", 0xd7000, 0x02000},
+                       {"soft-version", 0xd9000, 0x10000},
+                       {"profile", 0xe9000, 0x10000},
+                       {"default-config", 0xf9000, 0x10000},
+                       {"url-sig", 0x1e0000, 0x10000},
+                       {"radio", 0x1f0000, 0x10000},
+                       {"firmware", 0x200000, 0xe00000},
+                       {NULL, 0, 0}
+               },
+               .first_sysupgrade_partition = "os-image",
+               .last_sysupgrade_partition = "file-system",
+       },
+
        /** Firmware layout for the EAP120 */
        {
                .id     = "EAP120",
@@ -1442,7 +1704,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},
@@ -1471,7 +1733,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 = {
@@ -1493,14 +1755,50 @@ static struct device_info boards[] = {
                .last_sysupgrade_partition = "file-system"
        },
 
-       /** Firmware layout for the EAP225 v3 */
+       /** Firmware layout for the EAP225 v1 */
+       {
+               .id     = "EAP225-V1",
+               .support_list =
+                       "SupportList:\r\n"
+                       "EAP225(TP-LINK|UN|AC1200-D):1.0\r\n",
+               .part_trail = PART_TRAIL_NONE,
+               .soft_ver = SOFT_VER_DEFAULT,
+
+               .partitions = {
+                       {"fs-uboot", 0x00000, 0x20000},
+                       {"partition-table", 0x20000, 0x02000},
+                       {"default-mac", 0x30000, 0x01000},
+                       {"support-list", 0x31000, 0x00100},
+                       {"product-info", 0x31100, 0x00400},
+                       {"soft-version", 0x32000, 0x00100},
+                       {"firmware", 0x40000, 0xd80000},
+                       {"user-config", 0xdc0000, 0x30000},
+                       {"radio", 0xff0000, 0x10000},
+                       {NULL, 0, 0}
+               },
+
+               .first_sysupgrade_partition = "os-image",
+               .last_sysupgrade_partition = "file-system"
+       },
+
+       /** Firmware layout for the EAP225 v3
+        * Also compatible with:
+        *   - EAP225 v3.20
+        *   - EAP225 v4
+        *   - EAP225-Outdoor v1
+        *   - EAP225-Outdoor v3
+        *   */
        {
                .id     = "EAP225-V3",
                .support_list =
                        "SupportList:\r\n"
-                       "EAP225(TP-Link|UN|AC1350-D):3.0\r\n",
+                       "EAP225(TP-Link|UN|AC1350-D):3.0\r\n"
+                       "EAP225(TP-Link|UN|AC1350-D):3.20\r\n"
+                       "EAP225(TP-Link|UN|AC1350-D):4.0 CA\r\n"
+                       "EAP225-Outdoor(TP-Link|UN|AC1200-D):1.0\r\n"
+                       "EAP225-Outdoor(TP-Link|UN|AC1200-D):3.0 CA,JP\r\n",
                .part_trail = PART_TRAIL_NONE,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
                .soft_ver_compat_level = 1,
 
                .partitions = {
@@ -1529,7 +1827,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 = {
@@ -1558,7 +1856,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 = {
@@ -1587,7 +1885,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},
@@ -1611,9 +1909,10 @@ static struct device_info boards[] = {
                .id     = "EAP245-V3",
                .support_list =
                        "SupportList:\r\n"
-                       "EAP245(TP-Link|UN|AC1750-D):3.0\r\n",
+                       "EAP245(TP-Link|UN|AC1750-D):3.0\r\n"
+                       "EAP265 HD(TP-Link|UN|AC1750-D):1.0",
                .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 */
@@ -1638,6 +1937,79 @@ static struct device_info boards[] = {
                .last_sysupgrade_partition = "file-system"
        },
 
+       /** Firmware layout for the EAP615-Wall v1 */
+       {
+               .id = "EAP615-WALL-V1",
+               .soft_ver = SOFT_VER_DEFAULT,
+               .soft_ver_compat_level = 1,
+               .support_list =
+                       "SupportList:\r\n"
+                       "EAP615-Wall(TP-Link|UN|AX1800-D):1.0\r\n"
+                       "EAP615-Wall(TP-Link|CA|AX1800-D):1.0\r\n"
+                       "EAP615-Wall(TP-Link|JP|AX1800-D):1.0\r\n",
+               .part_trail = PART_TRAIL_NONE,
+
+               .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, 0xcf0000},
+                       {"user-config", 0xd90000, 0x60000},
+                       {"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 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",
@@ -1655,7 +2027,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
@@ -1697,7 +2069,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},
@@ -1728,7 +2100,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},
@@ -1765,7 +2137,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},
@@ -1800,7 +2172,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},
@@ -1827,6 +2199,45 @@ static struct device_info boards[] = {
                .last_sysupgrade_partition = "file-system"
        },
 
+       /** Firmware layout for the TL-WPA8631P v3 */
+       {
+               .id     = "TL-WPA8631P-V3",
+               .vendor = "",
+               .support_list =
+                       "SupportList:\n"
+                       "{product_name:TL-WPA8631P,product_ver:3.0.0,special_id:41550000}\n"
+                       "{product_name:TL-WPA8631P,product_ver:3.0.0,special_id:45550000}\n"
+                       "{product_name:TL-WPA8631P,product_ver:3.0.0,special_id:55530000}\n",
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_DEFAULT,
+
+               .partitions = {
+                       {"fs-uboot", 0x00000, 0x20000},
+                       {"firmware", 0x20000, 0x710000},
+                       {"partition-table", 0x730000, 0x02000},
+                       {"default-mac", 0x732000, 0x00020},
+                       {"pin", 0x732100, 0x00020},
+                       {"device-id", 0x732200, 0x00030},
+                       {"default-region", 0x732300, 0x00010},
+                       {"product-info", 0x732400, 0x00200},
+                       {"extra-para", 0x732600, 0x00200},
+                       {"soft-version", 0x732800, 0x00200},
+                       {"support-list", 0x732a00, 0x00100},
+                       {"profile", 0x732b00, 0x00100},
+                       {"default-config", 0x732c00, 0x00800},
+                       {"plc-type", 0x733400, 0x00020},
+                       {"default-pib", 0x733500, 0x06000},
+                       {"user-config", 0x740000, 0x10000},
+                       {"plc-pib", 0x750000, 0x10000},
+                       {"plc-nvm", 0x760000, 0x90000},
+                       {"radio", 0x7f0000, 0x10000},
+                       {NULL, 0, 0}
+               },
+
+               .first_sysupgrade_partition = "os-image",
+               .last_sysupgrade_partition = "file-system"
+       },
+
        /** Firmware layout for the TL-WR1043 v5 */
        {
                .id     = "TLWR1043NV5",
@@ -1836,7 +2247,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},
@@ -1870,7 +2281,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 = {
@@ -1903,7 +2314,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
@@ -1938,7 +2349,7 @@ static struct device_info boards[] = {
                        "SupportList:\n"
                        "{product_name:TL-WR941HP,product_ver:1.0.0,special_id:00000000}\n",
                .part_trail = 0x00,
-               .soft_ver = NULL,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -1970,7 +2381,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},
@@ -2017,7 +2428,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},
@@ -2061,7 +2472,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},
@@ -2105,7 +2516,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},
@@ -2148,7 +2559,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},
@@ -2185,7 +2596,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},
@@ -2207,6 +2618,47 @@ static struct device_info boards[] = {
                .last_sysupgrade_partition = "file-system"
        },
 
+       /** Firmware layout for the RE305 v3 */
+       {
+               .id     = "RE305-V3",
+               .vendor = "",
+               .support_list =
+                       "SupportList:\n"
+                       "{product_name:RE305,product_ver:3.0.0,special_id:00000000}\n"
+                       "{product_name:RE305,product_ver:3.0.0,special_id:45550000}\n"
+                       "{product_name:RE305,product_ver:3.0.0,special_id:4A500000}\n"
+                       "{product_name:RE305,product_ver:3.0.0,special_id:4B520000}\n"
+                       "{product_name:RE305,product_ver:3.0.0,special_id:41550000}\n"
+                       "{product_name:RE305,product_ver:3.0.0,special_id:42520000}\n"
+                       "{product_name:RE305,product_ver:3.0.0,special_id:55530000}\n"
+                       "{product_name:RE305,product_ver:3.0.0,special_id:45530000}\n"
+                       "{product_name:RE305,product_ver:3.0.0,special_id:41530000}\n"
+                       "{product_name:RE305,product_ver:3.0.0,special_id:43410000}\n"
+                       "{product_name:RE305,product_ver:3.0.0,special_id:52550000}\n",
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_TEXT("soft_ver:2.0.0\n"),
+
+               .partitions = {
+                       {"fs-uboot", 0x00000, 0x20000},
+                       {"firmware", 0x20000, 0x7a0000},
+                       {"partition-table", 0x7c0000, 0x02000},
+                       {"default-mac", 0x7c2000, 0x00020},
+                       {"pin", 0x7c2100, 0x00020},
+                       {"product-info", 0x7c3100, 0x01000},
+                       {"soft-version", 0x7c4200, 0x01000},
+                       {"support-list", 0x7c5200, 0x01000},
+                       {"profile", 0x7c6200, 0x08000},
+                       {"config-info", 0x7ce200, 0x00400},
+                       {"user-config", 0x7d0000, 0x10000},
+                       {"default-config", 0x7e0000, 0x10000},
+                       {"radio", 0x7f0000, 0x10000},
+                       {NULL, 0, 0}
+               },
+
+               .first_sysupgrade_partition = "os-image",
+               .last_sysupgrade_partition = "file-system"
+       },
+
        /** Firmware layout for the RE350 v1 */
        {
                .id     = "RE350-V1",
@@ -2221,7 +2673,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 = {
@@ -2252,7 +2704,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 = {
@@ -2291,7 +2743,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 = {
@@ -2329,7 +2781,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 = {
@@ -2368,7 +2820,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 = {
@@ -2407,7 +2859,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 = {
@@ -2445,7 +2937,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 = {
@@ -2482,7 +2974,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 = {
@@ -2504,6 +2996,85 @@ static struct device_info boards[] = {
                .first_sysupgrade_partition = "os-image",
                .last_sysupgrade_partition = "file-system"
        },
+       /** Firmware layout for the RE650 V2 (8MB Flash)*/
+       {
+               .id     = "RE650-V2",
+               .vendor = "",
+               .support_list =
+                       "SupportList:\n"
+                       "{product_name:RE650,product_ver:2.0.0,special_id:00000000}\n"
+                       "{product_name:RE650,product_ver:2.0.0,special_id:45550000}\n"
+                       "{product_name:RE650,product_ver:2.0.0,special_id:4A500000}\n"
+                       "{product_name:RE650,product_ver:2.0.0,special_id:41550000}\n"
+                       "{product_name:RE650,product_ver:2.0.0,special_id:43410000}\n"
+                       "{product_name:RE650,product_ver:2.0.0,special_id:41530000}\n"
+                       "{product_name:RE650,product_ver:2.0.0,special_id:55530000}\n",
+               .part_trail = 0x00,
+               /* For RE650 v2, soft ver is required, otherwise OEM install doesn't work */
+               .soft_ver = SOFT_VER_TEXT("soft_ver:2.0.0\n"),
+
+               /* We're using a dynamic kernel/rootfs split here */
+               .partitions = {
+                       {"fs-uboot", 0x00000, 0x20000},
+                       {"firmware", 0x20000, 0x7a0000},
+                       {"partition-table", 0x7c0000, 0x02000},
+                       {"default-mac", 0x7c2000, 0x00020},
+                       {"pin", 0x7c2100, 0x00020},
+                       {"product-info", 0x7c3100, 0x01000},
+                       {"soft-version", 0x7c4200, 0x01000},
+                       {"support-list", 0x7c5200, 0x01000},
+                       {"profile", 0x7c6200, 0x08000},
+                       {"config-info", 0x7ce200, 0x00400},
+                       {"user-config", 0x7d0000, 0x10000},
+                       {"default-config", 0x7e0000, 0x10000},
+                       {"radio", 0x7f0000, 0x10000},
+                       {NULL, 0, 0}
+               },
+
+               .first_sysupgrade_partition = "os-image",
+               .last_sysupgrade_partition = "file-system"
+       },
+
+       /** Firmware layout for the Mercusys MR70X */
+       {
+               .id     = "MR70X",
+               .vendor = "",
+               .support_list =
+                       "SupportList:\n"
+                       "{product_name:MR70X,product_ver:1.0.0,special_id:45550000}\n"
+                       "{product_name:MR70X,product_ver:1.0.0,special_id:4A500000}\n"
+                       "{product_name:MR70X,product_ver:1.0.0,special_id:55530000}\n",
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_DEFAULT,
+
+               .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"
+       },
 
        {}
 };
@@ -2572,9 +3143,33 @@ static struct image_partition_entry alloc_image_partition(const char *name, size
        return entry;
 }
 
+/** Sets up default partition names whenever custom names aren't specified */
+static void set_partition_names(struct device_info *info)
+{
+       if (!info->partition_names.partition_table)
+               info->partition_names.partition_table = "partition-table";
+       if (!info->partition_names.soft_ver)
+               info->partition_names.soft_ver = "soft-version";
+       if (!info->partition_names.os_image)
+               info->partition_names.os_image = "os-image";
+       if (!info->partition_names.support_list)
+               info->partition_names.support_list = "support-list";
+       if (!info->partition_names.file_system)
+               info->partition_names.file_system = "file-system";
+       if (!info->partition_names.extra_para)
+               info->partition_names.extra_para = "extra-para";
+}
+
 /** Frees an image partition */
-static void free_image_partition(struct image_partition_entry entry) {
-       free(entry.data);
+static void free_image_partition(struct image_partition_entry *entry)
+{
+       void *data = entry->data;
+
+       entry->name = NULL;
+       entry->size = 0;
+       entry->data = NULL;
+
+       free(data);
 }
 
 static time_t source_date_epoch = -1;
@@ -2592,8 +3187,9 @@ static void set_source_date_epoch() {
 }
 
 /** Generates the partition-table partition */
-static struct image_partition_entry make_partition_table(const struct flash_partition_entry *p) {
-       struct image_partition_entry entry = alloc_image_partition("partition-table", 0x800);
+static struct image_partition_entry make_partition_table(const struct device_info *p)
+{
+       struct image_partition_entry entry = alloc_image_partition(p->partition_names.partition_table, SAFELOADER_PAYLOAD_TABLE_SIZE);
 
        char *s = (char *)entry.data, *end = (char *)(s+entry.size);
 
@@ -2603,9 +3199,10 @@ static struct image_partition_entry make_partition_table(const struct flash_part
        *(s++) = 0x00;
 
        size_t i;
-       for (i = 0; p[i].name; i++) {
+       for (i = 0; p->partitions[i].name; i++) {
                size_t len = end-s;
-               size_t w = snprintf(s, len, "partition %s base 0x%05x size 0x%05x\n", p[i].name, p[i].base, p[i].size);
+               size_t w = snprintf(s, len, "partition %s base 0x%05x size 0x%05x\n",
+                       p->partitions[i].name, p->partitions[i].base, p->partitions[i].size);
 
                if (w > len-1)
                        error(1, 0, "flash partition table overflow?");
@@ -2628,15 +3225,14 @@ static inline uint8_t bcd(uint8_t v) {
 
 
 /** Generates the soft-version partition */
-static struct image_partition_entry make_soft_version(
-       const struct device_info *info, uint32_t rev)
+static struct image_partition_entry make_soft_version(const struct device_info *info, uint32_t rev)
 {
        /** 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;
-               return init_meta_partition_entry("soft-version",
-                       info->soft_ver, len, info->part_trail);
+       if (info->soft_ver.type == SOFT_VER_TYPE_TEXT) {
+               uint32_t len = strlen(info->soft_ver.text) + 1;
+               return init_meta_partition_entry(info->partition_names.soft_ver,
+                       info->soft_ver.text, len, info->part_trail);
        }
 
        time_t t;
@@ -2651,24 +3247,25 @@ 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,
+               return init_meta_partition_entry(info->partition_names.soft_ver, &s,
                        (uint8_t *)(&s.compat_level) - (uint8_t *)(&s),
                        info->part_trail);
        else
-               return init_meta_partition_entry("soft-version", &s,
+               return init_meta_partition_entry(info->partition_names.soft_ver, &s,
                        sizeof(s), info->part_trail);
 }
 
@@ -2677,7 +3274,7 @@ static struct image_partition_entry make_support_list(
        const struct device_info *info)
 {
        uint32_t len = strlen(info->support_list);
-       return init_meta_partition_entry("support-list", info->support_list,
+       return init_meta_partition_entry(info->partition_names.support_list, info->support_list,
                len, info->part_trail);
 }
 
@@ -2685,7 +3282,7 @@ static struct image_partition_entry make_support_list(
 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,
+       return init_meta_partition_entry(info->partition_names.extra_para, extra_para, len,
                info->part_trail);
 }
 
@@ -2755,9 +3352,9 @@ static struct image_partition_entry read_file(const char *part_name, const char
 */
 static void put_partitions(uint8_t *buffer, const struct flash_partition_entry *flash_parts, const struct image_partition_entry *parts) {
        size_t i, j;
-       char *image_pt = (char *)buffer, *end = image_pt + 0x800;
+       char *image_pt = (char *)buffer, *end = image_pt + SAFELOADER_PAYLOAD_TABLE_SIZE;
 
-       size_t base = 0x800;
+       size_t base = SAFELOADER_PAYLOAD_TABLE_SIZE;
        for (i = 0; parts[i].name; i++) {
                for (j = 0; flash_parts[j].name; j++) {
                        if (!strcmp(flash_parts[j].name, parts[i].name)) {
@@ -2810,7 +3407,7 @@ static void put_md5(uint8_t *md5, uint8_t *buffer, unsigned int len) {
      1814-xxxx    Firmware partitions
 */
 static void * generate_factory_image(struct device_info *info, const struct image_partition_entry *parts, size_t *len) {
-       *len = 0x1814;
+       *len = SAFELOADER_PAYLOAD_OFFSET + SAFELOADER_PAYLOAD_TABLE_SIZE;
 
        size_t i;
        for (i = 0; parts[i].name; i++)
@@ -2825,12 +3422,12 @@ static void * generate_factory_image(struct device_info *info, const struct imag
 
        if (info->vendor) {
                size_t vendor_len = strlen(info->vendor);
-               put32(image+0x14, vendor_len);
-               memcpy(image+0x18, info->vendor, vendor_len);
+               put32(image + SAFELOADER_PREAMBLE_SIZE, vendor_len);
+               memcpy(image + SAFELOADER_PREAMBLE_SIZE + 0x4, info->vendor, vendor_len);
        }
 
-       put_partitions(image + 0x1014, info->partitions, parts);
-       put_md5(image+0x04, image+0x14, *len-0x14);
+       put_partitions(image + SAFELOADER_PAYLOAD_OFFSET, info->partitions, parts);
+       put_md5(image + 0x04, image + SAFELOADER_PREAMBLE_SIZE, *len - SAFELOADER_PREAMBLE_SIZE);
 
        return image;
 }
@@ -2916,6 +3513,8 @@ static void build_image(const char *output,
        struct flash_partition_entry *file_system_partition = NULL;
        size_t firmware_partition_index = 0;
 
+       set_partition_names(info);
+
        for (i = 0; info->partitions[i].name; i++) {
                if (!strcmp(info->partitions[i].name, "firmware"))
                {
@@ -2939,7 +3538,8 @@ static void build_image(const char *output,
                for (i = MAX_PARTITIONS-1; i >= firmware_partition_index + 1; i--)
                        info->partitions[i+1] = info->partitions[i];
 
-               file_system_partition->name = "file-system";
+               file_system_partition->name = info->partition_names.file_system;
+
                file_system_partition->base = firmware_partition->base + kernel.st_size;
 
                /* Align partition start to erase blocks for factory images only */
@@ -2948,19 +3548,22 @@ static void build_image(const char *output,
 
                file_system_partition->size = firmware_partition->size - file_system_partition->base;
 
-               os_image_partition->name = "os-image";
+               os_image_partition->name = info->partition_names.os_image;
+
                os_image_partition->size = kernel.st_size;
        }
 
-       parts[0] = make_partition_table(info->partitions);
+       parts[0] = make_partition_table(info);
        parts[1] = make_soft_version(info, rev);
        parts[2] = make_support_list(info);
-       parts[3] = read_file("os-image", kernel_image, false, NULL);
-       parts[4] = read_file("file-system", rootfs_image, add_jffs2_eof, file_system_partition);
+       parts[3] = read_file(info->partition_names.os_image, kernel_image, false, NULL);
+       parts[4] = read_file(info->partition_names.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-A6-V3") == 0 ||
            strcasecmp(info->id, "ARCHER-A7-V5") == 0 ||
+           strcasecmp(info->id, "ARCHER-A9-V6") == 0 ||
            strcasecmp(info->id, "ARCHER-C2-V3") == 0 ||
            strcasecmp(info->id, "ARCHER-C7-V4") == 0 ||
            strcasecmp(info->id, "ARCHER-C7-V5") == 0 ||
@@ -2970,11 +3573,14 @@ static void build_image(const char *output,
            strcasecmp(info->id, "ARCHER-C60-V3") == 0 ||
            strcasecmp(info->id, "ARCHER-C6U-V1") == 0 ||
            strcasecmp(info->id, "ARCHER-C6-V3") == 0 ||
+           strcasecmp(info->id, "DECO-M4R-V4") == 0 ||
+           strcasecmp(info->id, "MR70X") == 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));
@@ -3004,7 +3610,7 @@ static void build_image(const char *output,
        free(image);
 
        for (i = 0; parts[i].name; i++)
-               free_image_partition(parts[i]);
+               free_image_partition(&parts[i]);
 }
 
 /** Usage output */
@@ -3078,12 +3684,17 @@ static int add_flash_partition(
 }
 
 /** read the partition table into struct flash_partition_entry */
+enum PARTITION_TABLE_TYPE {
+       PARTITION_TABLE_FWUP,
+       PARTITION_TABLE_FLASH,
+};
+
 static int read_partition_table(
                FILE *file, long offset,
                struct flash_partition_entry *entries, size_t max_entries,
                int type)
 {
-       char buf[2048];
+       char buf[SAFELOADER_PAYLOAD_TABLE_SIZE];
        char *ptr, *end;
        const char *parthdr = NULL;
        const char *fwuphdr = "fwup-ptn";
@@ -3092,23 +3703,23 @@ static int read_partition_table(
        /* TODO: search for the partition table */
 
        switch(type) {
-               case 0:
-                       parthdr = fwuphdr;
-                       break;
-               case 1:
-                       parthdr = flashhdr;
-                       break;
-               default:
-                       error(1, 0, "Invalid partition table");
+       case PARTITION_TABLE_FWUP:
+               parthdr = fwuphdr;
+               break;
+       case PARTITION_TABLE_FLASH:
+               parthdr = flashhdr;
+               break;
+       default:
+               error(1, 0, "Invalid partition table");
        }
 
        if (fseek(file, offset, SEEK_SET) < 0)
                error(1, errno, "Can not seek in the firmware");
 
-       if (fread(buf, 2048, 1, file) != 1)
+       if (fread(buf, sizeof(buf), 1, file) != 1)
                error(1, errno, "Can not read fwup-ptn from the firmware");
 
-       buf[2047] = '\0';
+       buf[sizeof(buf) - 1] = '\0';
 
        /* look for the partition header */
        if (memcmp(buf, parthdr, strlen(parthdr)) != 0) {
@@ -3235,7 +3846,7 @@ static int extract_firmware(const char *input, const char *output_directory)
 {
        struct flash_partition_entry entries[16] = { 0 };
        size_t max_entries = 16;
-       size_t firmware_offset = 0x1014;
+       size_t firmware_offset = SAFELOADER_PAYLOAD_OFFSET;
        FILE *input_file;
 
        struct stat statbuf;
@@ -3256,9 +3867,8 @@ static int extract_firmware(const char *input, const char *output_directory)
 
        input_file = fopen(input, "rb");
 
-       if (read_partition_table(input_file, firmware_offset, entries, 16, 0) != 0) {
+       if (read_partition_table(input_file, firmware_offset, entries, 16, PARTITION_TABLE_FWUP) != 0)
                error(1, 0, "Error can not read the partition table (fwup-ptn)");
-       }
 
        for (size_t i = 0; i < max_entries; i++) {
                if (entries[i].name == NULL &&
@@ -3297,9 +3907,8 @@ static int firmware_info(const char *input)
 
        fp = fopen(input, "r");
 
-       if (read_partition_table(fp, 0x1014, pointers, MAX_PARTITIONS, 0)) {
+       if (read_partition_table(fp, SAFELOADER_PAYLOAD_OFFSET, pointers, MAX_PARTITIONS, PARTITION_TABLE_FWUP))
                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");
@@ -3323,7 +3932,7 @@ static int firmware_info(const char *input)
                if (!buf)
                        error(1, errno, "Failed to alloc buffer");
 
-               if (fseek(fp, 0x1014 + e->base + sizeof(struct meta_header), SEEK_SET))
+               if (fseek(fp, SAFELOADER_PAYLOAD_OFFSET + 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)
@@ -3347,6 +3956,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");
                }
@@ -3359,27 +3969,30 @@ static int firmware_info(const char *input)
                char buf[128];
                size_t length;
                size_t bytes;
+               size_t max_length = sizeof(buf) - 1;
 
-               if (fseek(fp, 0x1014 + e->base + sizeof(struct meta_header), SEEK_SET))
+               if (fseek(fp, SAFELOADER_PAYLOAD_OFFSET + 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);
+                       bytes = fread(buf, 1, length > max_length ? max_length: length, fp);
                        if (bytes <= 0)
                                error(1, errno, "Can not read fwup-ptn data from the firmware");
 
-                       puts(buf);
+                       buf[bytes] = '\0';
+                       printf(buf);
                }
+        printf("\n");
        }
 
        e = find_partition(pointers, MAX_PARTITIONS, "partition-table", NULL);
        if (e) {
+               size_t flash_table_offset = SAFELOADER_PAYLOAD_OFFSET + e->base + 4;
                struct flash_partition_entry parts[MAX_PARTITIONS] = { };
 
-               if (read_partition_table(fp, 0x1014 + e->base + 4, parts, MAX_PARTITIONS, 1)) {
+               if (read_partition_table(fp, flash_table_offset, parts, MAX_PARTITIONS, PARTITION_TABLE_FLASH))
                        error(1, 0, "Error can not read the partition table (partition)");
-               }
 
                printf("\n[Partition table]\n");
                printf("%-8s %-8s %s\n", "base", "size", "name");
@@ -3425,8 +4038,9 @@ static void convert_firmware(const char *input, const char *output)
        struct flash_partition_entry *fwup_os_image = NULL, *fwup_file_system = NULL;
        struct flash_partition_entry *flash_os_image = NULL, *flash_file_system = NULL;
        struct flash_partition_entry *fwup_partition_table = NULL;
-       size_t firmware_offset = 0x1014;
+       size_t firmware_offset = SAFELOADER_PAYLOAD_OFFSET;
        FILE *input_file, *output_file;
+       size_t flash_table_offset;
 
        struct stat statbuf;
 
@@ -3455,7 +4069,8 @@ static void convert_firmware(const char *input, const char *output)
                        "partition-table", "Error can not find partition-table partition");
 
        /* the flash partition table has a 0x00000004 magic haeder */
-       if (read_partition_table(input_file, firmware_offset + fwup_partition_table->base + 4, flash, MAX_PARTITIONS, 1) != 0)
+       flash_table_offset = firmware_offset + fwup_partition_table->base + 4;
+       if (read_partition_table(input_file, flash_table_offset, flash, MAX_PARTITIONS, PARTITION_TABLE_FLASH) != 0)
                error(1, 0, "Error can not read the partition table (flash)");
 
        flash_os_image = find_partition(flash, MAX_PARTITIONS,