tplink-safeloader: replace hardcoded offsets
[project/firmware-utils.git] / src / tplink-safeloader.c
index f2e4a7ce9a71791b124407daec42618fb043bc37..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.
 */
 
 
 
 
 #include <assert.h>
+#include <ctype.h>
 #include <errno.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -65,27 +48,73 @@ 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 */
+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;
+       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;
 };
 
 /** The content of the soft-version structure */
 struct __attribute__((__packed__)) soft_version {
-       uint32_t magic;
-       uint32_t zero;
        uint8_t pad1;
        uint8_t version_major;
        uint8_t version_minor;
@@ -95,9 +124,14 @@ struct __attribute__((__packed__)) soft_version {
        uint8_t month;
        uint8_t day;
        uint32_t rev;
-       uint8_t pad2;
+       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};
 
@@ -131,8 +165,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},
@@ -140,8 +174,7 @@ static struct device_info boards[] = {
                        {"default-mac", 0x30000, 0x00020},
                        {"product-info", 0x31100, 0x00100},
                        {"signature", 0x32000, 0x00400},
-                       {"os-image", 0x40000, 0x200000},
-                       {"file-system", 0x240000, 0x570000},
+                       {"firmware", 0x40000, 0x770000},
                        {"soft-version", 0x7b0000, 0x00100},
                        {"support-list", 0x7b1000, 0x00400},
                        {"user-config", 0x7c0000, 0x10000},
@@ -171,8 +204,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},
@@ -204,10 +237,17 @@ static struct device_info boards[] = {
                        "SupportList:\r\n"
                        "CPE210(TP-LINK|EU|N300-2|45550000):3.0\r\n"
                        "CPE210(TP-LINK|UN|N300-2|00000000):3.0\r\n"
+                       "CPE210(TP-LINK|US|N300-2|55530000):3.0\r\n"
                        "CPE210(TP-LINK|UN|N300-2):3.0\r\n"
-                       "CPE210(TP-LINK|EU|N300-2):3.0\r\n",
-               .support_trail = '\xff',
-               .soft_ver = NULL,
+                       "CPE210(TP-LINK|EU|N300-2):3.0\r\n"
+                       "CPE210(TP-LINK|EU|N300-2|45550000):3.1\r\n"
+                       "CPE210(TP-LINK|UN|N300-2|00000000):3.1\r\n"
+                       "CPE210(TP-LINK|US|N300-2|55530000):3.1\r\n"
+                       "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",
+               .part_trail = 0xff,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -247,8 +287,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},
@@ -256,8 +296,7 @@ static struct device_info boards[] = {
                        {"default-mac", 0x30000, 0x00020},
                        {"product-info", 0x31100, 0x00100},
                        {"signature", 0x32000, 0x00400},
-                       {"os-image", 0x40000, 0x200000},
-                       {"file-system", 0x240000, 0x570000},
+                       {"firmware", 0x40000, 0x770000},
                        {"soft-version", 0x7b0000, 0x00100},
                        {"support-list", 0x7b1000, 0x00400},
                        {"user-config", 0x7c0000, 0x10000},
@@ -287,8 +326,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},
@@ -326,8 +365,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},
@@ -335,8 +374,7 @@ static struct device_info boards[] = {
                        {"default-mac", 0x30000, 0x00020},
                        {"product-info", 0x31100, 0x00100},
                        {"signature", 0x32000, 0x00400},
-                       {"os-image", 0x40000, 0x200000},
-                       {"file-system", 0x240000, 0x570000},
+                       {"firmware", 0x40000, 0x770000},
                        {"soft-version", 0x7b0000, 0x00100},
                        {"support-list", 0x7b1000, 0x00400},
                        {"user-config", 0x7c0000, 0x10000},
@@ -368,8 +406,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},
@@ -377,8 +415,7 @@ static struct device_info boards[] = {
                        {"default-mac", 0x30000, 0x00020},
                        {"product-info", 0x31100, 0x00100},
                        {"signature", 0x32000, 0x00400},
-                       {"os-image", 0x40000, 0x200000},
-                       {"file-system", 0x240000, 0x570000},
+                       {"firmware", 0x40000, 0x770000},
                        {"soft-version", 0x7b0000, 0x00100},
                        {"support-list", 0x7b1000, 0x00400},
                        {"user-config", 0x7c0000, 0x10000},
@@ -409,9 +446,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},
@@ -419,8 +459,7 @@ static struct device_info boards[] = {
                        {"default-mac", 0x30000, 0x00020},
                        {"product-info", 0x31100, 0x00100},
                        {"signature", 0x32000, 0x00400},
-                       {"os-image", 0x40000, 0x200000},
-                       {"file-system", 0x240000, 0x570000},
+                       {"firmware", 0x40000, 0x770000},
                        {"soft-version", 0x7b0000, 0x00100},
                        {"support-list", 0x7b1000, 0x00400},
                        {"user-config", 0x7c0000, 0x10000},
@@ -434,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",
@@ -450,8 +524,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},
@@ -459,8 +533,7 @@ static struct device_info boards[] = {
                        {"default-mac", 0x30000, 0x00020},
                        {"product-info", 0x31100, 0x00100},
                        {"signature", 0x32000, 0x00400},
-                       {"os-image", 0x40000, 0x200000},
-                       {"file-system", 0x240000, 0x570000},
+                       {"firmware", 0x40000, 0x770000},
                        {"soft-version", 0x7b0000, 0x00100},
                        {"support-list", 0x7b1000, 0x00400},
                        {"user-config", 0x7c0000, 0x10000},
@@ -490,8 +563,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},
@@ -499,8 +572,7 @@ static struct device_info boards[] = {
                        {"default-mac", 0x30000, 0x00020},
                        {"product-info", 0x31100, 0x00100},
                        {"signature", 0x32000, 0x00400},
-                       {"os-image", 0x40000, 0x200000},
-                       {"file-system", 0x240000, 0x570000},
+                       {"firmware", 0x40000, 0x770000},
                        {"soft-version", 0x7b0000, 0x00100},
                        {"support-list", 0x7b1000, 0x00400},
                        {"user-config", 0x7c0000, 0x10000},
@@ -513,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",
@@ -522,8 +631,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},
@@ -531,8 +640,7 @@ static struct device_info boards[] = {
                        {"default-mac", 0x30000, 0x00020},
                        {"product-info", 0x31100, 0x00100},
                        {"signature", 0x32000, 0x00400},
-                       {"os-image", 0x40000, 0x200000},
-                       {"file-system", 0x240000, 0x570000},
+                       {"firmware", 0x40000, 0x770000},
                        {"soft-version", 0x7b0000, 0x00100},
                        {"support-list", 0x7b1000, 0x00400},
                        {"user-config", 0x7c0000, 0x10000},
@@ -554,8 +662,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},
@@ -563,8 +671,7 @@ static struct device_info boards[] = {
                        {"default-mac", 0x30000, 0x00020},
                        {"product-info", 0x31100, 0x00100},
                        {"signature", 0x32000, 0x00400},
-                       {"os-image", 0x40000, 0x200000},
-                       {"file-system", 0x240000, 0x570000},
+                       {"firmware", 0x40000, 0x770000},
                        {"soft-version", 0x7b0000, 0x00100},
                        {"support-list", 0x7b1000, 0x00400},
                        {"user-config", 0x7c0000, 0x10000},
@@ -587,8 +694,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},
@@ -596,8 +703,7 @@ static struct device_info boards[] = {
                        {"default-mac", 0x30000, 0x00020},
                        {"product-info", 0x31100, 0x00100},
                        {"signature", 0x32000, 0x00400},
-                       {"os-image", 0x40000, 0x200000},
-                       {"file-system", 0x240000, 0x570000},
+                       {"firmware", 0x40000, 0x770000},
                        {"soft-version", 0x7b0000, 0x00100},
                        {"support-list", 0x7b1000, 0x00400},
                        {"user-config", 0x7c0000, 0x10000},
@@ -620,8 +726,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},
@@ -629,8 +735,7 @@ static struct device_info boards[] = {
                        {"default-mac", 0x30000, 0x00020},
                        {"product-info", 0x31100, 0x00100},
                        {"signature", 0x32000, 0x00400},
-                       {"os-image", 0x40000, 0x200000},
-                       {"file-system", 0x240000, 0x570000},
+                       {"firmware", 0x40000, 0x770000},
                        {"soft-version", 0x7b0000, 0x00100},
                        {"support-list", 0x7b1000, 0x00400},
                        {"user-config", 0x7c0000, 0x10000},
@@ -644,6 +749,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",
@@ -651,8 +800,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
@@ -701,9 +850,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:7.0.0\n"),
 
                /* We're using a dynamic kernel/rootfs split here */
                .partitions = {
@@ -732,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",
@@ -740,8 +933,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 */
 
@@ -778,8 +971,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 = {
@@ -817,8 +1010,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},
@@ -852,8 +1045,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 = {
@@ -890,8 +1083,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 = {
@@ -927,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",
-               .support_trail = '\x00',
-               .soft_ver = "soft_ver:1.2.1\n",
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_TEXT("soft_ver:1.9.1\n"),
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -965,8 +1159,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.1.1\n",
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_TEXT("soft_ver:1.9.1\n"),
 
                .partitions = {
                        {"factory-boot", 0x00000, 0x20000},
@@ -990,7 +1184,122 @@ 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}"
+                       "{product_name:Archer C6,product_ver:3.0.0,special_id:42520000}",
+               .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"
+                       "{product_name:Archer A6,product_ver:3.0.0,special_id:4A500000}\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",
@@ -1000,8 +1309,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},
@@ -1034,8 +1343,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},
@@ -1070,8 +1379,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},
@@ -1106,8 +1415,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},
@@ -1147,8 +1456,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 = {
@@ -1192,8 +1501,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 = {
@@ -1235,8 +1544,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},
@@ -1261,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",
@@ -1268,8 +1703,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},
@@ -1291,42 +1726,28 @@ static struct device_info boards[] = {
                .last_sysupgrade_partition = "file-system"
        },
 
-       /** Firmware layout for the TL-WA850RE v2 */
+       /** Firmware layout for the EAP225-Outdoor v1 */
        {
-               .id     = "TLWA850REV2",
-               .vendor = "",
+               .id     = "EAP225-OUTDOOR-V1",
                .support_list =
-                       "SupportList:\n"
-                       "{product_name:TL-WA850RE,product_ver:2.0.0,special_id:55530000}\n"
-                       "{product_name:TL-WA850RE,product_ver:2.0.0,special_id:00000000}\n"
-                       "{product_name:TL-WA850RE,product_ver:2.0.0,special_id:55534100}\n"
-                       "{product_name:TL-WA850RE,product_ver:2.0.0,special_id:45550000}\n"
-                       "{product_name:TL-WA850RE,product_ver:2.0.0,special_id:4B520000}\n"
-                       "{product_name:TL-WA850RE,product_ver:2.0.0,special_id:42520000}\n"
-                       "{product_name:TL-WA850RE,product_ver:2.0.0,special_id:4A500000}\n"
-                       "{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,
+                       "SupportList:\r\n"
+                       "EAP225-Outdoor(TP-Link|UN|AC1200-D):1.0\r\n",
+               .part_trail = PART_TRAIL_NONE,
+               .soft_ver = SOFT_VER_DEFAULT,
+               .soft_ver_compat_level = 1,
 
-               /**
-                  576KB were moved from file-system to os-image
-                  in comparison to the stock image
-               */
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
-                       {"firmware", 0x20000, 0x390000},
-                       {"partition-table", 0x3b0000, 0x02000},
-                       {"default-mac", 0x3c0000, 0x00020},
-                       {"pin", 0x3c0100, 0x00020},
-                       {"product-info", 0x3c1000, 0x01000},
-                       {"soft-version", 0x3c2000, 0x00100},
-                       {"support-list", 0x3c3000, 0x01000},
-                       {"profile", 0x3c4000, 0x08000},
-                       {"user-config", 0x3d0000, 0x10000},
-                       {"default-config", 0x3e0000, 0x10000},
-                       {"radio", 0x3f0000, 0x10000},
+                       {"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},
+                       {"mutil-log", 0xf30000, 0x80000},
+                       {"oops", 0xfb0000, 0x40000},
+                       {"radio", 0xff0000, 0x10000},
                        {NULL, 0, 0}
                },
 
@@ -1334,28 +1755,326 @@ static struct device_info boards[] = {
                .last_sysupgrade_partition = "file-system"
        },
 
-       /** Firmware layout for the TL-WA855RE v1 */
+       /** Firmware layout for the EAP225 v1 */
        {
-               .id     = "TLWA855REV1",
-               .vendor = "",
+               .id     = "EAP225-V1",
                .support_list =
-                       "SupportList:\n"
-                       "{product_name:TL-WA855RE,product_ver:1.0.0,special_id:00000000}\n"
-                       "{product_name:TL-WA855RE,product_ver:1.0.0,special_id:55530000}\n"
-                       "{product_name:TL-WA855RE,product_ver:1.0.0,special_id:45550000}\n"
-                       "{product_name:TL-WA855RE,product_ver:1.0.0,special_id:4B520000}\n"
-                       "{product_name:TL-WA855RE,product_ver:1.0.0,special_id:42520000}\n"
-                       "{product_name:TL-WA855RE,product_ver:1.0.0,special_id:4A500000}\n"
-                       "{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,
+                       "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},
-                       {"os-image", 0x20000, 0x150000},
-                       {"file-system", 0x170000, 0x240000},
+                       {"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.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 = SOFT_VER_DEFAULT,
+               .soft_ver_compat_level = 1,
+
+               .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},
+                       {"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 EAP225-Wall v2 */
+       {
+               .id     = "EAP225-WALL-V2",
+               .support_list =
+                       "SupportList:\r\n"
+                       "EAP225-Wall(TP-Link|UN|AC1200-D):2.0\r\n",
+               .part_trail = PART_TRAIL_NONE,
+               .soft_ver = SOFT_VER_DEFAULT,
+               .soft_ver_compat_level = 1,
+
+               .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},
+                       {"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 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",
+               .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 EAP245 v3 */
+       {
+               .id     = "EAP245-V3",
+               .support_list =
+                       "SupportList:\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 = SOFT_VER_DEFAULT,
+               .soft_ver_compat_level = 1,
+
+               /** Firmware partition with dynamic kernel/rootfs split */
+               .partitions = {
+                       {"factroy-boot", 0x00000, 0x40000},
+                       {"fs-uboot", 0x40000, 0x40000},
+                       {"partition-table", 0x80000, 0x10000},
+                       {"default-mac", 0x90000, 0x01000},
+                       {"support-list", 0x91000, 0x00100},
+                       {"product-info", 0x91100, 0x00400},
+                       {"soft-version", 0x92000, 0x00100},
+                       {"radio", 0xa0000, 0x10000},
+                       {"extra-para", 0xb0000, 0x10000},
+                       {"firmware", 0xc0000, 0xe40000},
+                       {"config", 0xf00000, 0x30000},
+                       {"mutil-log", 0xf30000, 0x80000},
+                       {"oops", 0xfb0000, 0x40000},
+                       {NULL, 0, 0}
+               },
+
+               .first_sysupgrade_partition = "os-image",
+               .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",
+               .vendor = "",
+               .support_list =
+                       "SupportList:\n"
+                       "{product_name:TL-WA850RE,product_ver:2.0.0,special_id:55530000}\n"
+                       "{product_name:TL-WA850RE,product_ver:2.0.0,special_id:00000000}\n"
+                       "{product_name:TL-WA850RE,product_ver:2.0.0,special_id:55534100}\n"
+                       "{product_name:TL-WA850RE,product_ver:2.0.0,special_id:45550000}\n"
+                       "{product_name:TL-WA850RE,product_ver:2.0.0,special_id:4B520000}\n"
+                       "{product_name:TL-WA850RE,product_ver:2.0.0,special_id:42520000}\n"
+                       "{product_name:TL-WA850RE,product_ver:2.0.0,special_id:4A500000}\n"
+                       "{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",
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_DEFAULT,
+
+               /**
+                  576KB were moved from file-system to os-image
+                  in comparison to the stock image
+               */
+               .partitions = {
+                       {"fs-uboot", 0x00000, 0x20000},
+                       {"firmware", 0x20000, 0x390000},
+                       {"partition-table", 0x3b0000, 0x02000},
+                       {"default-mac", 0x3c0000, 0x00020},
+                       {"pin", 0x3c0100, 0x00020},
+                       {"product-info", 0x3c1000, 0x01000},
+                       {"soft-version", 0x3c2000, 0x00100},
+                       {"support-list", 0x3c3000, 0x01000},
+                       {"profile", 0x3c4000, 0x08000},
+                       {"user-config", 0x3d0000, 0x10000},
+                       {"default-config", 0x3e0000, 0x10000},
+                       {"radio", 0x3f0000, 0x10000},
+                       {NULL, 0, 0}
+               },
+
+               .first_sysupgrade_partition = "os-image",
+               .last_sysupgrade_partition = "file-system"
+       },
+
+       /** Firmware layout for the TL-WA855RE v1 */
+       {
+               .id     = "TLWA855REV1",
+               .vendor = "",
+               .support_list =
+                       "SupportList:\n"
+                       "{product_name:TL-WA855RE,product_ver:1.0.0,special_id:00000000}\n"
+                       "{product_name:TL-WA855RE,product_ver:1.0.0,special_id:55530000}\n"
+                       "{product_name:TL-WA855RE,product_ver:1.0.0,special_id:45550000}\n"
+                       "{product_name:TL-WA855RE,product_ver:1.0.0,special_id:4B520000}\n"
+                       "{product_name:TL-WA855RE,product_ver:1.0.0,special_id:42520000}\n"
+                       "{product_name:TL-WA855RE,product_ver:1.0.0,special_id:4A500000}\n"
+                       "{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",
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_DEFAULT,
+
+               .partitions = {
+                       {"fs-uboot", 0x00000, 0x20000},
+                       {"os-image", 0x20000, 0x150000},
+                       {"file-system", 0x170000, 0x240000},
                        {"partition-table", 0x3b0000, 0x02000},
                        {"default-mac", 0x3c0000, 0x00020},
                        {"pin", 0x3c0100, 0x00020},
@@ -1373,6 +2092,152 @@ static struct device_info boards[] = {
                .last_sysupgrade_partition = "file-system"
        },
 
+       /** Firmware layout for the TL-WPA8630P v2 (EU)*/
+       {
+               .id     = "TL-WPA8630P-V2.0-EU",
+               .vendor = "",
+               .support_list =
+                       "SupportList:\n"
+                       "{product_name:TL-WPA8630P,product_ver:2.0.0,special_id:45550000}\n",
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_DEFAULT,
+
+               .partitions = {
+                       {"factory-uboot", 0x00000, 0x20000},
+                       {"fs-uboot", 0x20000, 0x20000},
+                       {"firmware", 0x40000, 0x5e0000},
+                       {"partition-table", 0x620000, 0x02000},
+                       {"default-mac", 0x630000, 0x00020},
+                       {"pin", 0x630100, 0x00020},
+                       {"device-id", 0x630200, 0x00030},
+                       {"product-info", 0x631100, 0x01000},
+                       {"extra-para", 0x632100, 0x01000},
+                       {"soft-version", 0x640000, 0x01000},
+                       {"support-list", 0x641000, 0x01000},
+                       {"profile", 0x642000, 0x08000},
+                       {"user-config", 0x650000, 0x10000},
+                       {"default-config", 0x660000, 0x10000},
+                       {"default-nvm", 0x670000, 0xc0000},
+                       {"default-pib", 0x730000, 0x40000},
+                       {"radio", 0x7f0000, 0x10000},
+                       {NULL, 0, 0}
+               },
+
+               .first_sysupgrade_partition = "os-image",
+               .last_sysupgrade_partition = "file-system"
+       },
+
+       /** Firmware layout for the TL-WPA8630P v2 (INT)*/
+       {
+               .id     = "TL-WPA8630P-V2-INT",
+               .vendor = "",
+               .support_list =
+                       "SupportList:\n"
+                       "{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",
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_DEFAULT,
+
+               .partitions = {
+                       {"factory-uboot", 0x00000, 0x20000},
+                       {"fs-uboot", 0x20000, 0x20000},
+                       {"firmware", 0x40000, 0x5e0000},
+                       {"partition-table", 0x620000, 0x02000},
+                       {"extra-para", 0x632100, 0x01000},
+                       {"soft-version", 0x640000, 0x01000},
+                       {"support-list", 0x641000, 0x01000},
+                       {"profile", 0x642000, 0x08000},
+                       {"user-config", 0x650000, 0x10000},
+                       {"default-config", 0x660000, 0x10000},
+                       {"default-nvm", 0x670000, 0xc0000},
+                       {"default-pib", 0x730000, 0x40000},
+                       {"default-mac", 0x7e0000, 0x00020},
+                       {"pin", 0x7e0100, 0x00020},
+                       {"device-id", 0x7e0200, 0x00030},
+                       {"product-info", 0x7e1100, 0x01000},
+                       {"radio", 0x7f0000, 0x10000},
+                       {NULL, 0, 0}
+               },
+
+               .first_sysupgrade_partition = "os-image",
+               .last_sysupgrade_partition = "file-system"
+       },
+
+       /** Firmware layout for the TL-WPA8630P v2.1 (EU)*/
+       {
+               .id     = "TL-WPA8630P-V2.1-EU",
+               .vendor = "",
+               .support_list =
+                       "SupportList:\n"
+                       "{product_name:TL-WPA8630P,product_ver:2.1.0,special_id:45550000}\n",
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_DEFAULT,
+
+               .partitions = {
+                       {"factory-uboot", 0x00000, 0x20000},
+                       {"fs-uboot", 0x20000, 0x20000},
+                       {"firmware", 0x40000, 0x5e0000},
+                       {"extra-para", 0x680000, 0x01000},
+                       {"product-info", 0x690000, 0x01000},
+                       {"partition-table", 0x6a0000, 0x02000},
+                       {"soft-version", 0x6b0000, 0x01000},
+                       {"support-list", 0x6b1000, 0x01000},
+                       {"profile", 0x6b2000, 0x08000},
+                       {"user-config", 0x6c0000, 0x10000},
+                       {"default-config", 0x6d0000, 0x10000},
+                       {"default-nvm", 0x6e0000, 0xc0000},
+                       {"default-pib", 0x7a0000, 0x40000},
+                       {"default-mac", 0x7e0000, 0x00020},
+                       {"pin", 0x7e0100, 0x00020},
+                       {"device-id", 0x7e0200, 0x00030},
+                       {"radio", 0x7f0000, 0x10000},
+                       {NULL, 0, 0}
+               },
+
+               .first_sysupgrade_partition = "os-image",
+               .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",
@@ -1381,8 +2246,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},
@@ -1415,8 +2280,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 = {
@@ -1448,8 +2313,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
@@ -1476,6 +2341,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",
@@ -1484,8 +2380,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},
@@ -1509,30 +2405,161 @@ static struct device_info boards[] = {
                },
 
                .first_sysupgrade_partition = "os-image",
-               .last_sysupgrade_partition = "file-system",
+               .last_sysupgrade_partition = "file-system",
+       },
+
+  /** Firmware layout for the RE200 v2 */
+       {
+               .id     = "RE200-V2",
+               .vendor = "",
+               .support_list =
+                       "SupportList:\n"
+                       "{product_name:RE200,product_ver:2.0.0,special_id:00000000}\n"
+                       "{product_name:RE200,product_ver:2.0.0,special_id:41520000}\n"
+                       "{product_name:RE200,product_ver:2.0.0,special_id:41550000}\n"
+                       "{product_name:RE200,product_ver:2.0.0,special_id:42520000}\n"
+                       "{product_name:RE200,product_ver:2.0.0,special_id:43410000}\n"
+                       "{product_name:RE200,product_ver:2.0.0,special_id:45530000}\n"
+                       "{product_name:RE200,product_ver:2.0.0,special_id:45550000}\n"
+                       "{product_name:RE200,product_ver:2.0.0,special_id:49440000}\n"
+                       "{product_name:RE200,product_ver:2.0.0,special_id:4a500000}\n"
+                       "{product_name:RE200,product_ver:2.0.0,special_id:4b520000}\n"
+                       "{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",
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_DEFAULT,
+
+               .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 RE200 v3 */
+       {
+               .id     = "RE200-V3",
+               .vendor = "",
+               .support_list =
+                       "SupportList:\n"
+                       "{product_name:RE200,product_ver:3.0.0,special_id:00000000}\n"
+                       "{product_name:RE200,product_ver:3.0.0,special_id:41520000}\n"
+                       "{product_name:RE200,product_ver:3.0.0,special_id:41550000}\n"
+                       "{product_name:RE200,product_ver:3.0.0,special_id:42520000}\n"
+                       "{product_name:RE200,product_ver:3.0.0,special_id:43410000}\n"
+                       "{product_name:RE200,product_ver:3.0.0,special_id:45470000}\n"
+                       "{product_name:RE200,product_ver:3.0.0,special_id:45530000}\n"
+                       "{product_name:RE200,product_ver:3.0.0,special_id:45550000}\n"
+                       "{product_name:RE200,product_ver:3.0.0,special_id:49440000}\n"
+                       "{product_name:RE200,product_ver:3.0.0,special_id:4A500000}\n"
+                       "{product_name:RE200,product_ver:3.0.0,special_id:4B520000}\n"
+                       "{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",
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_DEFAULT,
+
+               .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 RE200 v4 */
+       {
+               .id     = "RE200-V4",
+               .vendor = "",
+               .support_list =
+                       "SupportList:\n"
+                       "{product_name:RE200,product_ver:4.0.0,special_id:00000000}\n"
+                       "{product_name:RE200,product_ver:4.0.0,special_id:45550000}\n"
+                       "{product_name:RE200,product_ver:4.0.0,special_id:4A500000}\n"
+                       "{product_name:RE200,product_ver:4.0.0,special_id:4B520000}\n"
+                       "{product_name:RE200,product_ver:4.0.0,special_id:43410000}\n"
+                       "{product_name:RE200,product_ver:4.0.0,special_id:41550000}\n"
+                       "{product_name:RE200,product_ver:4.0.0,special_id:42520000}\n"
+                       "{product_name:RE200,product_ver:4.0.0,special_id:55530000}\n"
+                       "{product_name:RE200,product_ver:4.0.0,special_id:41520000}\n"
+                       "{product_name:RE200,product_ver:4.0.0,special_id:52550000}\n"
+                       "{product_name:RE200,product_ver:4.0.0,special_id:54570000}\n"
+                       "{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",
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_TEXT("soft_ver:1.1.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 RE200 v2 */
+       /** Firmware layout for the RE220 v2 */
        {
-               .id     = "RE200-V2",
+               .id     = "RE220-V2",
                .vendor = "",
                .support_list =
                        "SupportList:\n"
-                       "{product_name:RE200,product_ver:2.0.0,special_id:00000000}\n"
-                       "{product_name:RE200,product_ver:2.0.0,special_id:41520000}\n"
-                       "{product_name:RE200,product_ver:2.0.0,special_id:41550000}\n"
-                       "{product_name:RE200,product_ver:2.0.0,special_id:42520000}\n"
-                       "{product_name:RE200,product_ver:2.0.0,special_id:43410000}\n"
-                       "{product_name:RE200,product_ver:2.0.0,special_id:45530000}\n"
-                       "{product_name:RE200,product_ver:2.0.0,special_id:45550000}\n"
-                       "{product_name:RE200,product_ver:2.0.0,special_id:49440000}\n"
-                       "{product_name:RE200,product_ver:2.0.0,special_id:4a500000}\n"
-                       "{product_name:RE200,product_ver:2.0.0,special_id:4b520000}\n"
-                       "{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,
+                       "{product_name:RE220,product_ver:2.0.0,special_id:00000000}\n"
+                       "{product_name:RE220,product_ver:2.0.0,special_id:41520000}\n"
+                       "{product_name:RE220,product_ver:2.0.0,special_id:41550000}\n"
+                       "{product_name:RE220,product_ver:2.0.0,special_id:42520000}\n"
+                       "{product_name:RE220,product_ver:2.0.0,special_id:43410000}\n"
+                       "{product_name:RE220,product_ver:2.0.0,special_id:45530000}\n"
+                       "{product_name:RE220,product_ver:2.0.0,special_id:45550000}\n"
+                       "{product_name:RE220,product_ver:2.0.0,special_id:49440000}\n"
+                       "{product_name:RE220,product_ver:2.0.0,special_id:4a500000}\n"
+                       "{product_name:RE220,product_ver:2.0.0,special_id:4b520000}\n"
+                       "{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",
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_DEFAULT,
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
@@ -1568,8 +2595,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},
@@ -1591,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",
@@ -1604,8 +2672,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 = {
@@ -1635,8 +2703,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 = {
@@ -1674,8 +2742,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 = {
@@ -1712,8 +2780,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 = {
@@ -1751,8 +2819,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 = {
@@ -1790,8 +2858,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 = {
@@ -1815,6 +2923,43 @@ static struct device_info boards[] = {
                .last_sysupgrade_partition = "file-system"
        },
 
+       /** Firmware layout for the RE500 */
+       {
+               .id     = "RE500-V1",
+               .vendor = "",
+               .support_list =
+                       "SupportList:\r\n"
+                       "{product_name:RE500,product_ver:1.0.0,special_id:00000000}\r\n"
+                       "{product_name:RE500,product_ver:1.0.0,special_id:55530000}\r\n"
+                       "{product_name:RE500,product_ver:1.0.0,special_id:45550000}\r\n"
+                       "{product_name:RE500,product_ver:1.0.0,special_id:4A500000}\r\n"
+                       "{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",
+               .part_trail = 0x00,
+               .soft_ver = SOFT_VER_DEFAULT,
+
+               /* We're using a dynamic kernel/rootfs split here */
+               .partitions = {
+                       {"fs-uboot", 0x00000, 0x20000},
+                       {"firmware", 0x20000, 0xde0000},
+                       {"partition-table", 0xe00000, 0x02000},
+                       {"default-mac", 0xe10000, 0x00020},
+                       {"pin", 0xe10100, 0x00020},
+                       {"product-info", 0xe11100, 0x01000},
+                       {"soft-version", 0xe20000, 0x01000},
+                       {"support-list", 0xe21000, 0x01000},
+                       {"profile", 0xe22000, 0x08000},
+                       {"user-config", 0xe30000, 0x10000},
+                       {"default-config", 0xe40000, 0x10000},
+                       {"radio", 0xff0000, 0x10000},
+                       {NULL, 0, 0}
+               },
+
+               .first_sysupgrade_partition = "os-image",
+               .last_sysupgrade_partition = "file-system"
+       },
+
        /** Firmware layout for the RE650 */
        {
                .id     = "RE650-V1",
@@ -1828,8 +2973,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 = {
@@ -1851,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"
+       },
 
        {}
 };
@@ -1872,6 +3096,44 @@ 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,
+       enum partition_trail_value pad_value)
+{
+       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,
+               .data = malloc(total_len)
+       };
+       if (!entry.data)
+               error(1, errno, "failed to allocate meta partition entry");
+
+       struct meta_header *header = (struct meta_header *)entry.data;
+       header->length = htonl(data_len);
+       header->zero = 0;
+
+       if (data)
+               memcpy(entry.data+sizeof(*header), data, data_len);
+
+       if (meta_partition_should_pad(pad_value))
+               entry.data[total_len - 1] = (uint8_t) pad_value;
+
+       return entry;
+}
+
 /** Allocates a new image partition */
 static struct image_partition_entry alloc_image_partition(const char *name, size_t len) {
        struct image_partition_entry entry = {name, len, malloc(len)};
@@ -1881,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;
@@ -1901,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);
 
@@ -1912,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?");
@@ -1937,9 +3225,15 @@ static inline uint8_t bcd(uint8_t v) {
 
 
 /** Generates the soft-version partition */
-static struct image_partition_entry make_soft_version(uint32_t rev) {
-       struct image_partition_entry entry = alloc_image_partition("soft-version", sizeof(struct soft_version));
-       struct soft_version *s = (struct soft_version *)entry.data;
+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.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;
 
@@ -1948,55 +3242,48 @@ static struct image_partition_entry make_soft_version(uint32_t rev) {
        else if (time(&t) == (time_t)(-1))
                error(1, errno, "time");
 
-       struct tm *tm = localtime(&t);
-
-       s->magic = htonl(0x0000000c);
-       s->zero = 0;
-       s->pad1 = 0xff;
-
-       s->version_major = 0;
-       s->version_minor = 0;
-       s->version_patch = 0;
-
-       s->year_hi = bcd((1900+tm->tm_year)/100);
-       s->year_lo = bcd(tm->tm_year%100);
-       s->month = bcd(tm->tm_mon+1);
-       s->day = bcd(tm->tm_mday);
-       s->rev = htonl(rev);
+       struct tm *tm = gmtime(&t);
 
-       s->pad2 = 0xff;
+       struct soft_version s = {
+               .pad1 = 0xff,
 
-       return entry;
-}
+               .version_major = info->soft_ver.num[0],
+               .version_minor = info->soft_ver.num[1],
+               .version_patch = info->soft_ver.num[2],
 
-static struct image_partition_entry make_soft_version_from_string(const char *soft_ver) {
-       /** String length _including_ the terminating zero byte */
-       uint32_t ver_len = strlen(soft_ver) + 1;
-       /** Partition contains 64 bit header, the version string, and one additional null byte */
-       size_t partition_len = 2*sizeof(uint32_t) + ver_len + 1;
-       struct image_partition_entry entry = alloc_image_partition("soft-version", partition_len);
+               .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),
 
-       uint32_t *len = (uint32_t *)entry.data;
-       len[0] = htonl(ver_len);
-       len[1] = 0;
-       memcpy(&len[2], soft_ver, ver_len);
+               .compat_level = htonl(info->soft_ver_compat_level)
+       };
 
-       entry.data[partition_len - 1] = 0;
-
-       return entry;
+       if (info->soft_ver_compat_level == 0)
+               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(info->partition_names.soft_ver, &s,
+                       sizeof(s), info->part_trail);
 }
 
 /** Generates the support-list partition */
-static struct image_partition_entry make_support_list(struct device_info *info) {
-       size_t len = strlen(info->support_list);
-       struct image_partition_entry entry = alloc_image_partition("support-list", len + 9);
-
-       put32(entry.data, len);
-       memset(entry.data+4, 0, 4);
-       memcpy(entry.data+8, info->support_list, len);
-       entry.data[len+8] = info->support_trail;
+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(info->partition_names.support_list, info->support_list,
+               len, info->part_trail);
+}
 
-       return entry;
+/** 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(info->partition_names.extra_para, extra_para, len,
+               info->part_trail);
 }
 
 /** Creates a new image partition with an arbitrary name from a file */
@@ -2036,16 +3323,6 @@ static struct image_partition_entry read_file(const char *part_name, const char
        return entry;
 }
 
-/** Creates a new image partition from arbitrary data */
-static struct image_partition_entry put_data(const char *part_name, const char *datain, size_t len) {
-
-       struct image_partition_entry entry = alloc_image_partition(part_name, len);
-
-       memcpy(entry.data, datain, len);
-
-       return entry;
-}
-
 /**
    Copies a list of image partitions into an image buffer and generates the image partition table while doing so
 
@@ -2075,9 +3352,9 @@ static struct image_partition_entry put_data(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)) {
@@ -2130,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++)
@@ -2145,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;
 }
@@ -2236,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"))
                {
@@ -2259,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 */
@@ -2268,38 +3548,47 @@ 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);
-       if (info->soft_ver)
-               parts[1] = make_soft_version_from_string(info->soft_ver);
-       else
-               parts[1] = make_soft_version(rev);
-
+       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-C2-V3") == 0 ||
+       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 ||
            strcasecmp(info->id, "ARCHER-C25-V1") == 0 ||
            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, "DECO-M4R-V4") == 0 ||
+           strcasecmp(info->id, "MR70X") == 0 ||
            strcasecmp(info->id, "TLWR1043NV5") == 0) {
-               const char mdat[11] = {0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00};
-               parts[5] = put_data("extra-para", mdat, 11);
-       } else if (strcasecmp(info->id, "ARCHER-A7-V5") == 0 || strcasecmp(info->id, "ARCHER-C7-V4") == 0 || strcasecmp(info->id, "ARCHER-C7-V5") == 0) {
-               const char mdat[11] = {0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0xca, 0x00, 0x01, 0x00, 0x00};
-               parts[5] = put_data("extra-para", mdat, 11);
-       } else if (strcasecmp(info->id, "ARCHER-C6-V2") == 0) {
-               const char mdat[11] = {0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00};
-               parts[5] = put_data("extra-para", mdat, 11);
-       } else if (strcasecmp(info->id, "ARCHER-C6-V2-US") == 0) {
-               const char mdat[11] = {0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00};
-               parts[5] = put_data("extra-para", mdat, 11);
+               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 ||
+                  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));
+       } else if (strcasecmp(info->id, "ARCHER-C6-V2-US") == 0 ||
+                  strcasecmp(info->id, "EAP245-V3") == 0) {
+               const uint8_t extra_para[2] = {0x01, 0x01};
+               parts[5] = make_extra_para(info, extra_para,
+                       sizeof(extra_para));
        }
 
        size_t len;
@@ -2321,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 */
@@ -2332,6 +3621,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"
@@ -2393,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";
@@ -2407,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) {
@@ -2550,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;
@@ -2571,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 &&
@@ -2596,10 +3891,126 @@ 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, 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");
+       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, 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)
+                       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;
+               size_t max_length = sizeof(buf) - 1;
+
+               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 > max_length ? max_length: length, fp);
+                       if (bytes <= 0)
+                               error(1, errno, "Can not read fwup-ptn data from the firmware");
+
+                       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, 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");
+               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];
@@ -2627,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;
 
@@ -2657,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,
@@ -2679,7 +4092,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;
@@ -2689,11 +4102,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;
@@ -2744,7 +4161,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)