ath79: support for TP-Link EAP225-Outdoor v1
[openwrt/staging/ynezz.git] / tools / firmware-utils / src / tplink-safeloader.c
index 15eaa830d6fed15f2b90933e253fd42832845601..4389cf03462284a029dd0dc4c616bf5615af2c49 100644 (file)
@@ -77,6 +77,7 @@ struct device_info {
        const char *support_list;
        char support_trail;
        const char *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;
@@ -84,7 +85,7 @@ struct device_info {
 
 /** The content of the soft-version structure */
 struct __attribute__((__packed__)) soft_version {
-       uint32_t magic;
+       uint32_t data_len;
        uint32_t zero;
        uint8_t pad1;
        uint8_t version_major;
@@ -95,7 +96,6 @@ struct __attribute__((__packed__)) soft_version {
        uint8_t month;
        uint8_t day;
        uint32_t rev;
-       uint8_t pad2;
 };
 
 
@@ -118,10 +118,10 @@ static const uint8_t md5_salt[16] = {
 
 /** Firmware layout table */
 static struct device_info boards[] = {
-       /** Firmware layout for the CPE210/220 */
+       /** Firmware layout for the CPE210/220 V1 */
        {
-               .id     = "CPE210",
-               .vendor = "CPE510(TP-LINK|UN|N300-5):1.0\r\n",
+               .id     = "CPE210",
+               .vendor = "CPE510(TP-LINK|UN|N300-5):1.0\r\n",
                .support_list =
                        "SupportList:\r\n"
                        "CPE210(TP-LINK|UN|N300-2):1.0\r\n"
@@ -140,8 +140,8 @@ static struct device_info boards[] = {
                        {"default-mac", 0x30000, 0x00020},
                        {"product-info", 0x31100, 0x00100},
                        {"signature", 0x32000, 0x00400},
-                       {"os-image", 0x40000, 0x1c0000},
-                       {"file-system", 0x200000, 0x5b0000},
+                       {"os-image", 0x40000, 0x300000},
+                       {"file-system", 0x340000, 0x470000},
                        {"soft-version", 0x7b0000, 0x00100},
                        {"support-list", 0x7b1000, 0x00400},
                        {"user-config", 0x7c0000, 0x10000},
@@ -182,8 +182,7 @@ static struct device_info boards[] = {
                        {"device-info", 0x31400, 0x00400},
                        {"signature", 0x32000, 0x00400},
                        {"device-id", 0x33000, 0x00100},
-                       {"os-image", 0x40000, 0x1c0000},
-                       {"file-system", 0x200000, 0x5b0000},
+                       {"firmware", 0x40000, 0x770000},
                        {"soft-version", 0x7b0000, 0x00100},
                        {"support-list", 0x7b1000, 0x01000},
                        {"user-config", 0x7c0000, 0x10000},
@@ -197,10 +196,133 @@ static struct device_info boards[] = {
                .last_sysupgrade_partition = "support-list",
        },
 
-       /** Firmware layout for the CPE510/520 */
+       /** Firmware layout for the CPE210 V3 */
        {
-               .id     = "CPE510",
-               .vendor = "CPE510(TP-LINK|UN|N300-5):1.0\r\n",
+               .id     = "CPE210V3",
+               .vendor = "CPE210(TP-LINK|UN|N300-2|00000000):3.0\r\n",
+               .support_list =
+                       "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"
+                       "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",
+               .support_trail = '\xff',
+               .soft_ver = NULL,
+
+               .partitions = {
+                       {"fs-uboot", 0x00000, 0x20000},
+                       {"partition-table", 0x20000, 0x01000},
+                       {"default-mac", 0x30000, 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 CPE220 V2 */
+       {
+               .id     = "CPE220V2",
+               .vendor = "CPE510(TP-LINK|UN|N300-5):1.0\r\n",
+               .support_list =
+                       "SupportList:\r\n"
+                       "CPE220(TP-LINK|EU|N300-2|00000000):2.0\r\n"
+                       "CPE220(TP-LINK|EU|N300-2|45550000):2.0\r\n"
+                       "CPE220(TP-LINK|EU|N300-2|55530000):2.0\r\n"
+                       "CPE220(TP-LINK|UN|N300-2|00000000):2.0\r\n"
+                       "CPE220(TP-LINK|UN|N300-2|45550000):2.0\r\n"
+                       "CPE220(TP-LINK|UN|N300-2|55530000):2.0\r\n"
+                       "CPE220(TP-LINK|US|N300-2|55530000):2.0\r\n"
+                       "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,
+
+               .partitions = {
+                       {"fs-uboot", 0x00000, 0x20000},
+                       {"partition-table", 0x20000, 0x02000},
+                       {"default-mac", 0x30000, 0x00020},
+                       {"product-info", 0x31100, 0x00100},
+                       {"signature", 0x32000, 0x00400},
+                       {"os-image", 0x40000, 0x300000},
+                       {"file-system", 0x340000, 0x470000},
+                       {"soft-version", 0x7b0000, 0x00100},
+                       {"support-list", 0x7b1000, 0x00400},
+                       {"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 CPE220 V3 */
+       {
+               .id     = "CPE220V3",
+               .vendor = "CPE220(TP-LINK|UN|N300-2|00000000):3.0\r\n",
+               .support_list =
+                       "SupportList:\r\n"
+                       "CPE220(TP-LINK|EU|N300-2|00000000):3.0\r\n"
+                       "CPE220(TP-LINK|EU|N300-2|45550000):3.0\r\n"
+                       "CPE220(TP-LINK|EU|N300-2|55530000):3.0\r\n"
+                       "CPE220(TP-LINK|UN|N300-2|00000000):3.0\r\n"
+                       "CPE220(TP-LINK|UN|N300-2|45550000):3.0\r\n"
+                       "CPE220(TP-LINK|UN|N300-2|55530000):3.0\r\n"
+                       "CPE220(TP-LINK|US|N300-2|55530000):3.0\r\n"
+                       "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,
+
+               .partitions = {
+                       {"fs-uboot", 0x00000, 0x20000},
+                       {"partition-table", 0x20000, 0x02000},
+                       {"default-mac", 0x30000, 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 CPE510/520 V1 */
+       {
+               .id     = "CPE510",
+               .vendor = "CPE510(TP-LINK|UN|N300-5):1.0\r\n",
                .support_list =
                        "SupportList:\r\n"
                        "CPE510(TP-LINK|UN|N300-5):1.0\r\n"
@@ -220,8 +342,50 @@ static struct device_info boards[] = {
                        {"default-mac", 0x30000, 0x00020},
                        {"product-info", 0x31100, 0x00100},
                        {"signature", 0x32000, 0x00400},
-                       {"os-image", 0x40000, 0x1c0000},
-                       {"file-system", 0x200000, 0x5b0000},
+                       {"os-image", 0x40000, 0x300000},
+                       {"file-system", 0x340000, 0x470000},
+                       {"soft-version", 0x7b0000, 0x00100},
+                       {"support-list", 0x7b1000, 0x00400},
+                       {"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 CPE510 V2 */
+       {
+               .id     = "CPE510V2",
+               .vendor = "CPE510(TP-LINK|UN|N300-5):2.0\r\n",
+               .support_list =
+                       "SupportList:\r\n"
+                       "CPE510(TP-LINK|EU|N300-5|00000000):2.0\r\n"
+                       "CPE510(TP-LINK|EU|N300-5|45550000):2.0\r\n"
+                       "CPE510(TP-LINK|EU|N300-5|55530000):2.0\r\n"
+                       "CPE510(TP-LINK|UN|N300-5|00000000):2.0\r\n"
+                       "CPE510(TP-LINK|UN|N300-5|45550000):2.0\r\n"
+                       "CPE510(TP-LINK|UN|N300-5|55530000):2.0\r\n"
+                       "CPE510(TP-LINK|US|N300-5|00000000):2.0\r\n"
+                       "CPE510(TP-LINK|US|N300-5|45550000):2.0\r\n"
+                       "CPE510(TP-LINK|US|N300-5|55530000):2.0\r\n"
+                       "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,
+
+               .partitions = {
+                       {"fs-uboot", 0x00000, 0x20000},
+                       {"partition-table", 0x20000, 0x02000},
+                       {"default-mac", 0x30000, 0x00020},
+                       {"product-info", 0x31100, 0x00100},
+                       {"signature", 0x32000, 0x00400},
+                       {"os-image", 0x40000, 0x300000},
+                       {"file-system", 0x340000, 0x470000},
                        {"soft-version", 0x7b0000, 0x00100},
                        {"support-list", 0x7b1000, 0x00400},
                        {"user-config", 0x7c0000, 0x10000},
@@ -235,9 +399,131 @@ static struct device_info boards[] = {
                .last_sysupgrade_partition = "support-list",
        },
 
+       /** Firmware layout for the CPE510 V3 */
        {
-               .id     = "WBS210",
-               .vendor = "CPE510(TP-LINK|UN|N300-5):1.0\r\n",
+               .id     = "CPE510V3",
+               .vendor = "CPE510(TP-LINK|UN|N300-5):3.0\r\n",
+               .support_list =
+                       "SupportList:\r\n"
+                       "CPE510(TP-LINK|EU|N300-5|00000000):3.0\r\n"
+                       "CPE510(TP-LINK|EU|N300-5|45550000):3.0\r\n"
+                       "CPE510(TP-LINK|EU|N300-5|55530000):3.0\r\n"
+                       "CPE510(TP-LINK|UN|N300-5|00000000):3.0\r\n"
+                       "CPE510(TP-LINK|UN|N300-5|45550000):3.0\r\n"
+                       "CPE510(TP-LINK|UN|N300-5|55530000):3.0\r\n"
+                       "CPE510(TP-LINK|US|N300-5|00000000):3.0\r\n"
+                       "CPE510(TP-LINK|US|N300-5|45550000):3.0\r\n"
+                       "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,
+
+               .partitions = {
+                       {"fs-uboot", 0x00000, 0x20000},
+                       {"partition-table", 0x20000, 0x02000},
+                       {"default-mac", 0x30000, 0x00020},
+                       {"product-info", 0x31100, 0x00100},
+                       {"signature", 0x32000, 0x00400},
+                       {"os-image", 0x40000, 0x300000},
+                       {"file-system", 0x340000, 0x470000},
+                       {"soft-version", 0x7b0000, 0x00100},
+                       {"support-list", 0x7b1000, 0x00400},
+                       {"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",
+               .vendor = "CPE610(TP-LINK|UN|N300-5|00000000):1.0\r\n",
+               .support_list =
+                       "SupportList:\r\n"
+                       "CPE610(TP-LINK|EU|N300-5|00000000):1.0\r\n"
+                       "CPE610(TP-LINK|EU|N300-5|45550000):1.0\r\n"
+                       "CPE610(TP-LINK|EU|N300-5|55530000):1.0\r\n"
+                       "CPE610(TP-LINK|UN|N300-5|00000000):1.0\r\n"
+                       "CPE610(TP-LINK|UN|N300-5|45550000):1.0\r\n"
+                       "CPE610(TP-LINK|UN|N300-5|55530000):1.0\r\n"
+                       "CPE610(TP-LINK|US|N300-5|55530000):1.0\r\n"
+                       "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,
+
+               .partitions = {
+                       {"fs-uboot", 0x00000, 0x20000},
+                       {"partition-table", 0x20000, 0x02000},
+                       {"default-mac", 0x30000, 0x00020},
+                       {"product-info", 0x31100, 0x00100},
+                       {"signature", 0x32000, 0x00400},
+                       {"os-image", 0x40000, 0x300000},
+                       {"file-system", 0x340000, 0x470000},
+                       {"soft-version", 0x7b0000, 0x00100},
+                       {"support-list", 0x7b1000, 0x00400},
+                       {"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 CPE610V2 */
+       {
+               .id     = "CPE610V2",
+               .vendor = "CPE610(TP-LINK|UN|N300-5|00000000):2.0\r\n",
+               .support_list =
+                       "SupportList:\r\n"
+                       "CPE610(TP-LINK|EU|N300-5|00000000):2.0\r\n"
+                       "CPE610(TP-LINK|EU|N300-5|45550000):2.0\r\n"
+                       "CPE610(TP-LINK|EU|N300-5|55530000):2.0\r\n"
+                       "CPE610(TP-LINK|UN|N300-5|00000000):2.0\r\n"
+                       "CPE610(TP-LINK|UN|N300-5|45550000):2.0\r\n"
+                       "CPE610(TP-LINK|UN|N300-5|55530000):2.0\r\n"
+                       "CPE610(TP-LINK|US|N300-5|55530000):2.0\r\n"
+                       "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,
+
+               .partitions = {
+                       {"fs-uboot", 0x00000, 0x20000},
+                       {"partition-table", 0x20000, 0x02000},
+                       {"default-mac", 0x30000, 0x00020},
+                       {"product-info", 0x31100, 0x00100},
+                       {"signature", 0x32000, 0x00400},
+                       {"os-image", 0x40000, 0x300000},
+                       {"file-system", 0x340000, 0x470000},
+                       {"soft-version", 0x7b0000, 0x00100},
+                       {"support-list", 0x7b1000, 0x00400},
+                       {"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",
+       },
+
+       {
+               .id     = "WBS210",
+               .vendor = "CPE510(TP-LINK|UN|N300-5):1.0\r\n",
                .support_list =
                        "SupportList:\r\n"
                        "WBS210(TP-LINK|UN|N300-2):1.20\r\n"
@@ -252,8 +538,8 @@ static struct device_info boards[] = {
                        {"default-mac", 0x30000, 0x00020},
                        {"product-info", 0x31100, 0x00100},
                        {"signature", 0x32000, 0x00400},
-                       {"os-image", 0x40000, 0x1c0000},
-                       {"file-system", 0x200000, 0x5b0000},
+                       {"os-image", 0x40000, 0x300000},
+                       {"file-system", 0x340000, 0x470000},
                        {"soft-version", 0x7b0000, 0x00100},
                        {"support-list", 0x7b1000, 0x00400},
                        {"user-config", 0x7c0000, 0x10000},
@@ -268,13 +554,46 @@ static struct device_info boards[] = {
        },
 
        {
-               .id     = "WBS510",
-               .vendor = "CPE510(TP-LINK|UN|N300-5):1.0\r\n",
+               .id     = "WBS210V2",
+               .vendor = "CPE510(TP-LINK|UN|N300-5):1.0\r\n",
+               .support_list =
+                       "SupportList:\r\n"
+                       "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,
+
+               .partitions = {
+                       {"fs-uboot", 0x00000, 0x20000},
+                       {"partition-table", 0x20000, 0x02000},
+                       {"default-mac", 0x30000, 0x00020},
+                       {"product-info", 0x31100, 0x00100},
+                       {"signature", 0x32000, 0x00400},
+                       {"os-image", 0x40000, 0x300000},
+                       {"file-system", 0x340000, 0x470000},
+                       {"soft-version", 0x7b0000, 0x00100},
+                       {"support-list", 0x7b1000, 0x00400},
+                       {"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",
+       },
+
+       {
+               .id     = "WBS510",
+               .vendor = "CPE510(TP-LINK|UN|N300-5):1.0\r\n",
                .support_list =
                        "SupportList:\r\n"
                        "WBS510(TP-LINK|UN|N300-5):1.20\r\n"
                        "WBS510(TP-LINK|US|N300-5):1.20\r\n"
-                       "WBS510(TP-LINK|EU|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,
 
@@ -284,8 +603,41 @@ static struct device_info boards[] = {
                        {"default-mac", 0x30000, 0x00020},
                        {"product-info", 0x31100, 0x00100},
                        {"signature", 0x32000, 0x00400},
-                       {"os-image", 0x40000, 0x1c0000},
-                       {"file-system", 0x200000, 0x5b0000},
+                       {"os-image", 0x40000, 0x300000},
+                       {"file-system", 0x340000, 0x470000},
+                       {"soft-version", 0x7b0000, 0x00100},
+                       {"support-list", 0x7b1000, 0x00400},
+                       {"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",
+       },
+
+       {
+               .id     = "WBS510V2",
+               .vendor = "CPE510(TP-LINK|UN|N300-5):1.0\r\n",
+               .support_list =
+                       "SupportList:\r\n"
+                       "WBS510(TP-LINK|UN|N300-5|00000000):2.0\r\n"
+                       "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,
+
+               .partitions = {
+                       {"fs-uboot", 0x00000, 0x20000},
+                       {"partition-table", 0x20000, 0x02000},
+                       {"default-mac", 0x30000, 0x00020},
+                       {"product-info", 0x31100, 0x00100},
+                       {"signature", 0x32000, 0x00400},
+                       {"os-image", 0x40000, 0x300000},
+                       {"file-system", 0x340000, 0x470000},
                        {"soft-version", 0x7b0000, 0x00100},
                        {"support-list", 0x7b1000, 0x00400},
                        {"user-config", 0x7c0000, 0x10000},
@@ -301,7 +653,7 @@ static struct device_info boards[] = {
 
        /** Firmware layout for the C2600 */
        {
-               .id = "C2600",
+               .id     = "C2600",
                .vendor = "",
                .support_list =
                        "SupportList:\r\n"
@@ -347,9 +699,87 @@ static struct device_info boards[] = {
                .last_sysupgrade_partition = "file-system"
        },
 
+       /** Firmware layout for the A7-V5 */
+       {
+               .id     = "ARCHER-A7-V5",
+               .support_list =
+                       "SupportList:\n"
+                       "{product_name:Archer A7,product_ver:5.0.0,special_id:45550000}\n"
+                       "{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",
+
+               /* We're using a dynamic kernel/rootfs split here */
+               .partitions = {
+                       {"factory-boot", 0x00000, 0x20000},
+                       {"fs-uboot", 0x20000, 0x20000},
+                       {"firmware", 0x40000, 0xec0000},        /* Stock: name os-image base 0x40000 size 0x120000 */
+                                                               /* Stock: name file-system base 0x160000 size 0xda0000 */
+                       {"default-mac", 0xf40000, 0x00200},
+                       {"pin", 0xf40200, 0x00200},
+                       {"device-id", 0xf40400, 0x00100},
+                       {"product-info", 0xf40500, 0x0fb00},
+                       {"soft-version", 0xf50000, 0x00100},
+                       {"extra-para", 0xf51000, 0x01000},
+                       {"support-list", 0xf52000, 0x0a000},
+                       {"profile", 0xf5c000, 0x04000},
+                       {"default-config", 0xf60000, 0x10000},
+                       {"user-config", 0xf70000, 0x40000},
+                       {"certificate", 0xfb0000, 0x10000},
+                       {"partition-table", 0xfc0000, 0x10000},
+                       {"log", 0xfd0000, 0x20000},
+                       {"radio", 0xff0000, 0x10000},
+                       {NULL, 0, 0}
+               },
+
+               .first_sysupgrade_partition = "os-image",
+               .last_sysupgrade_partition = "file-system",
+       },
+
+       /** Firmware layout for the C2v3 */
+       {
+               .id     = "ARCHER-C2-V3",
+               .support_list =
+                       "SupportList:\n"
+                       "{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",
+
+               /** We're using a dynamic kernel/rootfs split here */
+
+               .partitions = {
+                       {"factory-boot", 0x00000, 0x20000},
+                       {"fs-uboot", 0x20000, 0x10000},
+                       {"firmware", 0x30000, 0x7a0000},
+                       {"user-config", 0x7d0000, 0x04000},
+                       {"default-mac", 0x7e0000, 0x00100},
+                       {"device-id", 0x7e0100, 0x00100},
+                       {"extra-para", 0x7e0200, 0x00100},
+                       {"pin", 0x7e0300, 0x00100},
+                       {"support-list", 0x7e0400, 0x00400},
+                       {"soft-version", 0x7e0800, 0x00400},
+                       {"product-info", 0x7e0c00, 0x01400},
+                       {"partition-table", 0x7e2000, 0x01000},
+                       {"profile", 0x7e3000, 0x01000},
+                       {"default-config", 0x7e4000, 0x04000},
+                       {"merge-config", 0x7ec000, 0x02000},
+                       {"qos-db", 0x7ee000, 0x02000},
+                       {"radio", 0x7f0000, 0x10000},
+                       {NULL, 0, 0}
+               },
+
+               .first_sysupgrade_partition = "os-image",
+               .last_sysupgrade_partition = "file-system",
+       },
+
        /** Firmware layout for the C25v1 */
        {
-               .id = "ARCHER-C25-V1",
+               .id     = "ARCHER-C25-V1",
                .support_list =
                        "SupportList:\n"
                        "{product_name:ArcherC25,product_ver:1.0.0,special_id:00000000}\n"
@@ -358,16 +788,12 @@ static struct device_info boards[] = {
                .support_trail = '\x00',
                .soft_ver = "soft_ver:1.0.0\n",
 
-               /**
-                   We use a bigger os-image partition than the stock images (and thus
-                   smaller file-system), as our kernel doesn't fit in the stock firmware's
-                   1MB os-image.
-               */
+               /* We're using a dynamic kernel/rootfs split here */
                .partitions = {
                        {"factory-boot", 0x00000, 0x20000},
                        {"fs-uboot", 0x20000, 0x10000},
-                       {"os-image", 0x30000, 0x180000},        /* Stock: base 0x30000 size 0x100000 */
-                       {"file-system", 0x1b0000, 0x620000},    /* Stock: base 0x130000 size 0x6a0000 */
+                       {"firmware", 0x30000, 0x7a0000},        /* Stock: name os-image base 0x30000 size 0x100000 */
+                                                               /* Stock: name file-system base 0x130000 size 0x6a0000 */
                        {"user-config", 0x7d0000, 0x04000},
                        {"default-mac", 0x7e0000, 0x00100},
                        {"device-id", 0x7e0100, 0x00100},
@@ -391,8 +817,8 @@ static struct device_info boards[] = {
 
        /** Firmware layout for the C58v1 */
        {
-               .id     = "ARCHER-C58-V1",
-               .vendor = "",
+               .id     = "ARCHER-C58-V1",
+               .vendor = "",
                .support_list =
                        "SupportList:\r\n"
                        "{product_name:Archer C58,product_ver:1.0.0,special_id:00000000}\r\n"
@@ -413,8 +839,7 @@ static struct device_info boards[] = {
                        {"profile", 0x11700, 0x03900},
                        {"default-config", 0x15000, 0x04000},
                        {"user-config", 0x19000, 0x04000},
-                       {"os-image", 0x20000, 0x180000},
-                       {"file-system", 0x1a0000, 0x648000},
+                       {"firmware", 0x20000, 0x7c8000},
                        {"certyficate", 0x7e8000, 0x08000},
                        {"radio", 0x7f0000, 0x10000},
                        {NULL, 0, 0}
@@ -426,8 +851,8 @@ static struct device_info boards[] = {
 
        /** Firmware layout for the C59v1 */
        {
-               .id     = "ARCHER-C59-V1",
-               .vendor = "",
+               .id     = "ARCHER-C59-V1",
+               .vendor = "",
                .support_list =
                        "SupportList:\r\n"
                        "{product_name:Archer C59,product_ver:1.0.0,special_id:00000000}\r\n"
@@ -437,14 +862,14 @@ static struct device_info boards[] = {
                .support_trail = '\x00',
                .soft_ver = "soft_ver:1.0.0\n",
 
+               /* We're using a dynamic kernel/rootfs split here */
                .partitions = {
                        {"fs-uboot", 0x00000, 0x10000},
                        {"default-mac", 0x10000, 0x00200},
                        {"pin", 0x10200, 0x00200},
                        {"device-id", 0x10400, 0x00100},
                        {"product-info", 0x10500, 0x0fb00},
-                       {"os-image", 0x20000, 0x180000},
-                       {"file-system", 0x1a0000, 0xcb0000},
+                       {"firmware", 0x20000, 0xe30000},
                        {"partition-table", 0xe50000, 0x10000},
                        {"soft-version", 0xe60000, 0x10000},
                        {"support-list", 0xe70000, 0x10000},
@@ -465,8 +890,8 @@ static struct device_info boards[] = {
 
        /** Firmware layout for the C59v2 */
        {
-               .id     = "ARCHER-C59-V2",
-               .vendor = "",
+               .id     = "ARCHER-C59-V2",
+               .vendor = "",
                .support_list =
                        "SupportList:\r\n"
                        "{product_name:Archer C59,product_ver:2.0.0,special_id:00000000}\r\n"
@@ -503,10 +928,80 @@ static struct device_info boards[] = {
                .last_sysupgrade_partition = "file-system",
        },
 
+       /** Firmware layout for the Archer C6 v2 (EU/RU/JP) */
+       {
+               .id     = "ARCHER-C6-V2",
+               .vendor = "",
+               .support_list =
+                       "SupportList:\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.9.1\n",
+
+               .partitions = {
+                       {"fs-uboot", 0x00000, 0x20000},
+                       {"default-mac", 0x20000, 0x00200},
+                       {"pin", 0x20200, 0x00100},
+                       {"product-info", 0x20300, 0x00200},
+                       {"device-id", 0x20500, 0x0fb00},
+                       {"firmware", 0x30000, 0x7a9400},
+                       {"soft-version", 0x7d9400, 0x00100},
+                       {"extra-para", 0x7d9500, 0x00100},
+                       {"support-list", 0x7d9600, 0x00200},
+                       {"profile", 0x7d9800, 0x03000},
+                       {"default-config", 0x7dc800, 0x03000},
+                       {"partition-table", 0x7df800, 0x00800},
+                       {"user-config", 0x7e0000, 0x0c000},
+                       {"certificate", 0x7ec000, 0x04000},
+                       {"radio", 0x7f0000, 0x10000},
+                       {NULL, 0, 0}
+               },
+
+               .first_sysupgrade_partition = "os-image",
+               .last_sysupgrade_partition = "file-system",
+       },
+
+       /** Firmware layout for the Archer C6 v2 (US) and A6 v2 (US/TW) */
+       {
+               .id     = "ARCHER-C6-V2-US",
+               .vendor = "",
+               .support_list =
+                       "SupportList:\n"
+                       "{product_name:Archer A6,product_ver:2.0.0,special_id:55530000}\n"
+                       "{product_name:Archer A6,product_ver:2.0.0,special_id:54570000}\n"
+                       "{product_name:Archer C6,product_ver:2.0.0,special_id:55530000}\n",
+               .support_trail = '\x00',
+               .soft_ver = "soft_ver:1.9.1\n",
+
+               .partitions = {
+                       {"factory-boot", 0x00000, 0x20000},
+                       {"default-mac", 0x20000, 0x00200},
+                       {"pin", 0x20200, 0x00100},
+                       {"product-info", 0x20300, 0x00200},
+                       {"device-id", 0x20500, 0x0fb00},
+                       {"fs-uboot", 0x30000, 0x20000},
+                       {"firmware", 0x50000, 0xf89400},
+                       {"soft-version", 0xfd9400, 0x00100},
+                       {"extra-para", 0xfd9500, 0x00100},
+                       {"support-list", 0xfd9600, 0x00200},
+                       {"profile", 0xfd9800, 0x03000},
+                       {"default-config", 0xfdc800, 0x03000},
+                       {"partition-table", 0xfdf800, 0x00800},
+                       {"user-config", 0xfe0000, 0x0c000},
+                       {"certificate", 0xfec000, 0x04000},
+                       {"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",
-               .vendor = "",
+               .id     = "ARCHER-C60-V1",
+               .vendor = "",
                .support_list =
                        "SupportList:\r\n"
                        "{product_name:Archer C60,product_ver:1.0.0,special_id:00000000}\r\n"
@@ -527,8 +1022,7 @@ static struct device_info boards[] = {
                        {"profile", 0x11700, 0x03900},
                        {"default-config", 0x15000, 0x04000},
                        {"user-config", 0x19000, 0x04000},
-                       {"os-image", 0x20000, 0x180000},
-                       {"file-system", 0x1a0000, 0x648000},
+                       {"firmware", 0x20000, 0x7c8000},
                        {"certyficate", 0x7e8000, 0x08000},
                        {"radio", 0x7f0000, 0x10000},
                        {NULL, 0, 0}
@@ -540,8 +1034,8 @@ static struct device_info boards[] = {
 
        /** Firmware layout for the C60v2 */
        {
-               .id     = "ARCHER-C60-V2",
-               .vendor = "",
+               .id     = "ARCHER-C60-V2",
+               .vendor = "",
                .support_list =
                        "SupportList:\r\n"
                        "{product_name:Archer C60,product_ver:2.0.0,special_id:42520000}\r\n"
@@ -557,8 +1051,43 @@ static struct device_info boards[] = {
                        {"product-info", 0x1fe00, 0x00100},
                        {"device-id", 0x1ff00, 0x00100},
                        {"fs-uboot", 0x20000, 0x10000},
-                       {"os-image", 0x30000, 0x180000},
-                       {"file-system", 0x1b0000, 0x620000},
+                       {"firmware", 0x30000, 0x7a0000},
+                       {"soft-version", 0x7d9500, 0x00100},
+                       {"support-list", 0x7d9600, 0x00100},
+                       {"extra-para", 0x7d9700, 0x00100},
+                       {"profile", 0x7d9800, 0x03000},
+                       {"default-config", 0x7dc800, 0x03000},
+                       {"partition-table", 0x7df800, 0x00800},
+                       {"user-config", 0x7e0000, 0x0c000},
+                       {"certificate", 0x7ec000, 0x04000},
+                       {"radio", 0x7f0000, 0x10000},
+                       {NULL, 0, 0}
+               },
+
+               .first_sysupgrade_partition = "os-image",
+               .last_sysupgrade_partition = "file-system",
+       },
+
+       /** Firmware layout for the C60v3 */
+       {
+               .id     = "ARCHER-C60-V3",
+               .vendor = "",
+               .support_list =
+                       "SupportList:\r\n"
+                       "{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",
+
+               .partitions = {
+                       {"factory-boot", 0x00000, 0x1fb00},
+                       {"default-mac", 0x1fb00, 0x00200},
+                       {"pin", 0x1fd00, 0x00100},
+                       {"product-info", 0x1fe00, 0x00100},
+                       {"device-id", 0x1ff00, 0x00100},
+                       {"fs-uboot", 0x20000, 0x10000},
+                       {"firmware", 0x30000, 0x7a0000},
                        {"soft-version", 0x7d9500, 0x00100},
                        {"support-list", 0x7d9600, 0x00100},
                        {"extra-para", 0x7d9700, 0x00100},
@@ -577,7 +1106,7 @@ static struct device_info boards[] = {
 
        /** Firmware layout for the C5 */
        {
-               .id = "ARCHER-C5-V2",
+               .id     = "ARCHER-C5-V2",
                .vendor = "",
                .support_list =
                        "SupportList:\r\n"
@@ -612,7 +1141,7 @@ static struct device_info boards[] = {
 
        /** Firmware layout for the C7 */
        {
-               .id = "ARCHER-C7-V4",
+               .id     = "ARCHER-C7-V4",
                .support_list =
                        "SupportList:\n"
                        "{product_name:Archer C7,product_ver:4.0.0,special_id:00000000}\n"
@@ -628,16 +1157,12 @@ static struct device_info boards[] = {
                .support_trail = '\x00',
                .soft_ver = "soft_ver:1.0.0\n",
 
-               /**
-                   We use a bigger os-image partition than the stock images (and thus
-                   smaller file-system), as our kernel doesn't fit in the stock firmware's
-                   1MB os-image.
-               */
+               /* We're using a dynamic kernel/rootfs split here */
                .partitions = {
                        {"factory-boot", 0x00000, 0x20000},
                        {"fs-uboot", 0x20000, 0x20000},
-                       {"os-image", 0x40000, 0x180000},        /* Stock: base 0x40000 size 0x120000 */
-                       {"file-system", 0x1c0000, 0xd40000},    /* Stock: base 0x160000 size 0xda0000 */
+                       {"firmware", 0x40000, 0xEC0000},        /* Stock: name os-image base 0x40000 size 0x120000 */
+                                                               /* Stock: name file-system base 0x160000 size 0xda0000 */
                        {"default-mac", 0xf00000, 0x00200},
                        {"pin", 0xf00200, 0x00200},
                        {"device-id", 0xf00400, 0x00100},
@@ -662,20 +1187,22 @@ static struct device_info boards[] = {
 
        /** Firmware layout for the C7 v5*/
        {
-               .id = "ARCHER-C7-V5",
+               .id     = "ARCHER-C7-V5",
                .support_list =
                        "SupportList:\n"
                        "{product_name:Archer C7,product_ver:5.0.0,special_id:00000000}\n"
-                       "{product_name:Archer C7,product_ver:5.0.0,special_id:55530000}\n",
+                       "{product_name:Archer C7,product_ver:5.0.0,special_id:45550000}\n"
+                       "{product_name:Archer C7,product_ver:5.0.0,special_id:55530000}\n"
+                       "{product_name:Archer C7,product_ver:5.0.0,special_id:43410000}\n"
+                       "{product_name:Archer C7,product_ver:5.0.0,special_id:4A500000}\n"
+                       "{product_name:Archer C7,product_ver:5.0.0,special_id:54570000}\n"
+                       "{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",
 
-               /**
-                 We use a bigger os-image partition than the stock images (and thus
-                 smaller file-system), as our kernel doesn't fit in the stock firmware's
-                 1MB os-image.
-                 */
+               /* We're using a dynamic kernel/rootfs split here */
                .partitions = {
                        {"factory-boot",    0x00000,  0x20000},
                        {"fs-uboot",        0x20000,  0x20000},
@@ -692,8 +1219,8 @@ static struct device_info boards[] = {
                        {"user-config",     0x80000,  0x40000},
 
 
-                       {"os-image",        0xc0000,  0x180000}, /* Stock: base 0xc0000  size 0x120000 */
-                       {"file-system",     0x240000, 0xd80000}, /* Stock: base 0x1e0000 size 0xde0000 */
+                       {"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},
@@ -708,7 +1235,7 @@ static struct device_info boards[] = {
 
        /** Firmware layout for the C9 */
        {
-               .id = "ARCHERC9",
+               .id     = "ARCHERC9",
                .vendor = "",
                .support_list =
                        "SupportList:\n"
@@ -741,29 +1268,145 @@ static struct device_info boards[] = {
                .last_sysupgrade_partition = "file-system"
        },
 
-       /** Firmware layout for the EAP120 */
+       /** Firmware layout for the EAP120 */
+       {
+               .id     = "EAP120",
+               .vendor = "EAP120(TP-LINK|UN|N300-2):1.0\r\n",
+               .support_list =
+                       "SupportList:\r\n"
+                       "EAP120(TP-LINK|UN|N300-2):1.0\r\n",
+               .support_trail = '\xff',
+               .soft_ver = NULL,
+
+               .partitions = {
+                       {"fs-uboot", 0x00000, 0x20000},
+                       {"partition-table", 0x20000, 0x02000},
+                       {"default-mac", 0x30000, 0x00020},
+                       {"support-list", 0x31000, 0x00100},
+                       {"product-info", 0x31100, 0x00100},
+                       {"soft-version", 0x32000, 0x00100},
+                       {"os-image", 0x40000, 0x180000},
+                       {"file-system", 0x1c0000, 0x600000},
+                       {"user-config", 0x7c0000, 0x10000},
+                       {"backup-config", 0x7d0000, 0x10000},
+                       {"log", 0x7e0000, 0x10000},
+                       {"radio", 0x7f0000, 0x10000},
+                       {NULL, 0, 0}
+               },
+
+               .first_sysupgrade_partition = "os-image",
+               .last_sysupgrade_partition = "file-system"
+       },
+
+       /** Firmware layout for the EAP225-Outdoor v1 */
+       {
+               .id     = "EAP225-OUTDOOR-V1",
+               .support_list =
+                       "SupportList:\r\n"
+                       "EAP225-Outdoor(TP-Link|UN|AC1200-D):1.0\r\n",
+               .support_trail = '\xff',
+               .soft_ver = NULL,
+               .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",
+               .support_trail = '\xff',
+               .soft_ver = NULL,
+               .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 EAP245 v1 */
+       {
+               .id     = "EAP245-V1",
+               .support_list =
+                       "SupportList:\r\n"
+                       "EAP245(TP-LINK|UN|AC1750-D):1.0\r\n",
+               .support_trail = '\xff',
+               .soft_ver = NULL,
+
+               .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     = "EAP120",
-               .vendor = "EAP120(TP-LINK|UN|N300-2):1.0\r\n",
+               .id     = "EAP245-V3",
                .support_list =
                        "SupportList:\r\n"
-                       "EAP120(TP-LINK|UN|N300-2):1.0\r\n",
+                       "EAP245(TP-Link|UN|AC1750-D):3.0\r\n",
                .support_trail = '\xff',
                .soft_ver = NULL,
+               .soft_ver_compat_level = 1,
 
+               /** Firmware partition with dynamic kernel/rootfs split */
                .partitions = {
-                       {"fs-uboot", 0x00000, 0x20000},
-                       {"partition-table", 0x20000, 0x02000},
-                       {"default-mac", 0x30000, 0x00020},
-                       {"support-list", 0x31000, 0x00100},
-                       {"product-info", 0x31100, 0x00100},
-                       {"soft-version", 0x32000, 0x00100},
-                       {"os-image", 0x40000, 0x180000},
-                       {"file-system", 0x1c0000, 0x600000},
-                       {"user-config", 0x7c0000, 0x10000},
-                       {"backup-config", 0x7d0000, 0x10000},
-                       {"log", 0x7e0000, 0x10000},
-                       {"radio", 0x7f0000, 0x10000},
+                       {"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}
                },
 
@@ -796,8 +1439,7 @@ static struct device_info boards[] = {
                */
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
-                       {"os-image", 0x20000, 0x150000},
-                       {"file-system", 0x170000, 0x240000},
+                       {"firmware", 0x20000, 0x390000},
                        {"partition-table", 0x3b0000, 0x02000},
                        {"default-mac", 0x3c0000, 0x00020},
                        {"pin", 0x3c0100, 0x00020},
@@ -854,6 +1496,113 @@ 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",
+               .support_trail = '\x00',
+               .soft_ver = NULL,
+
+               .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",
+               .support_trail = '\x00',
+               .soft_ver = NULL,
+
+               .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",
+               .support_trail = '\x00',
+               .soft_ver = NULL,
+
+               .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-WR1043 v5 */
        {
                .id     = "TLWR1043NV5",
@@ -867,8 +1616,7 @@ static struct device_info boards[] = {
                .partitions = {
                        {"factory-boot", 0x00000, 0x20000},
                        {"fs-uboot", 0x20000, 0x20000},
-                       {"os-image", 0x40000, 0x180000},
-                       {"file-system", 0x1c0000, 0xd40000},
+                       {"firmware", 0x40000, 0xec0000},
                        {"default-mac", 0xf00000, 0x00200},
                        {"pin", 0xf00200, 0x00200},
                        {"device-id", 0xf00400, 0x00100},
@@ -939,8 +1687,7 @@ static struct device_info boards[] = {
                */
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
-                       {"os-image", 0x20000, 0x180000},
-                       {"file-system", 0x1a0000, 0x5b0000},
+                       {"firmware", 0x20000, 0x730000},
                        {"default-mac", 0x750000, 0x00200},
                        {"pin", 0x750200, 0x00200},
                        {"product-info", 0x750400, 0x0fc00},
@@ -972,8 +1719,7 @@ static struct device_info boards[] = {
 
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
-                       {"os-image", 0x20000, 0x180000},
-                       {"file-system", 0x1a0000, 0xca0000},
+                       {"firmware", 0x20000, 0xe20000},
                        {"default-mac", 0xe40000, 0x00200},
                        {"pin", 0xe40200, 0x00200},
                        {"product-info", 0xe40400, 0x0fc00},
@@ -996,9 +1742,219 @@ static struct device_info boards[] = {
                .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",
+               .support_trail = '\x00',
+               .soft_ver = NULL,
+
+               .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",
+               .support_trail = '\x00',
+               .soft_ver = NULL,
+
+               .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",
+               .support_trail = '\x00',
+               .soft_ver = "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 RE220 v2 */
+       {
+               .id     = "RE220-V2",
+               .vendor = "",
+               .support_list =
+                       "SupportList:\n"
+                       "{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",
+               .support_trail = '\x00',
+               .soft_ver = NULL,
+
+               .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 RE305 v1 */
+       {
+               .id     = "RE305-V1",
+               .vendor = "",
+               .support_list =
+                       "SupportList:\n"
+                       "{product_name:RE305,product_ver:1.0.0,special_id:45550000}\n"
+                       "{product_name:RE305,product_ver:1.0.0,special_id:55530000}\n"
+                       "{product_name:RE305,product_ver:1.0.0,special_id:4a500000}\n"
+                       "{product_name:RE305,product_ver:1.0.0,special_id:42520000}\n"
+                       "{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,
+
+               .partitions = {
+                       {"fs-uboot", 0x00000, 0x20000},
+                       {"firmware", 0x20000, 0x5e0000},
+                       {"partition-table", 0x600000, 0x02000},
+                       {"default-mac", 0x610000, 0x00020},
+                       {"pin", 0x610100, 0x00020},
+                       {"product-info", 0x611100, 0x01000},
+                       {"soft-version", 0x620000, 0x01000},
+                       {"support-list", 0x621000, 0x01000},
+                       {"profile", 0x622000, 0x08000},
+                       {"user-config", 0x630000, 0x10000},
+                       {"default-config", 0x640000, 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",
+               .id     = "RE350-V1",
                .vendor = "",
                .support_list =
                        "SupportList:\n"
@@ -1033,9 +1989,41 @@ static struct device_info boards[] = {
                .last_sysupgrade_partition = "file-system"
        },
 
+       /** Firmware layout for the RE350K v1 */
+       {
+               .id     = "RE350K-V1",
+               .vendor = "",
+               .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,
+
+               /** We're using a dynamic kernel/rootfs split here */
+               .partitions = {
+                       {"fs-uboot", 0x00000, 0x20000},
+                       {"firmware", 0x20000, 0xd70000},
+                       {"partition-table", 0xd90000, 0x02000},
+                       {"default-mac", 0xda0000, 0x00020},
+                       {"pin", 0xda0100, 0x00020},
+                       {"product-info", 0xda1100, 0x01000},
+                       {"soft-version", 0xdb0000, 0x01000},
+                       {"support-list", 0xdb1000, 0x01000},
+                       {"profile", 0xdb2000, 0x08000},
+                       {"user-config", 0xdc0000, 0x10000},
+                       {"default-config", 0xdd0000, 0x10000},
+                       {"device-id", 0xde0000, 0x00108},
+                       {"radio", 0xff0000, 0x10000},
+                       {NULL, 0, 0}
+               },
+
+               .first_sysupgrade_partition = "os-image",
+               .last_sysupgrade_partition = "file-system"
+       },
+
        /** Firmware layout for the RE355 */
        {
-               .id = "RE355",
+               .id     = "RE355",
                .vendor = "",
                .support_list =
                        "SupportList:\r\n"
@@ -1050,15 +2038,10 @@ static struct device_info boards[] = {
                .support_trail = '\x00',
                .soft_ver = NULL,
 
-               /**
-                  The flash partition table for RE355;
-                  it is almost the same as the one used by the stock images,
-                  576KB were moved from file-system to os-image.
-               */
+               /* We're using a dynamic kernel/rootfs split here */
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
-                       {"os-image", 0x20000, 0x180000},
-                       {"file-system", 0x1a0000, 0x460000},
+                       {"firmware", 0x20000, 0x5e0000},
                        {"partition-table", 0x600000, 0x02000},
                        {"default-mac", 0x610000, 0x00020},
                        {"pin", 0x610100, 0x00020},
@@ -1078,7 +2061,7 @@ static struct device_info boards[] = {
 
        /** Firmware layout for the RE450 */
        {
-               .id = "RE450",
+               .id     = "RE450",
                .vendor = "",
                .support_list =
                        "SupportList:\r\n"
@@ -1093,15 +2076,10 @@ static struct device_info boards[] = {
                .support_trail = '\x00',
                .soft_ver = NULL,
 
-               /**
-                  The flash partition table for RE450;
-                  it is almost the same as the one used by the stock images,
-                  576KB were moved from file-system to os-image.
-               */
+               /** We're using a dynamic kernel/rootfs split here */
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
-                       {"os-image", 0x20000, 0x180000},
-                       {"file-system", 0x1a0000, 0x460000},
+                       {"firmware", 0x20000, 0x5e0000},
                        {"partition-table", 0x600000, 0x02000},
                        {"default-mac", 0x610000, 0x00020},
                        {"pin", 0x610100, 0x00020},
@@ -1121,7 +2099,7 @@ static struct device_info boards[] = {
 
        /** Firmware layout for the RE450 v2 */
        {
-               .id = "RE450-V2",
+               .id     = "RE450-V2",
                .vendor = "",
                .support_list =
                        "SupportList:\r\n"
@@ -1151,7 +2129,120 @@ static struct device_info boards[] = {
                        {"user-config", 0x630000, 0x10000},
                        {"default-config", 0x640000, 0x10000},
                        {"radio", 0x7f0000, 0x10000},
+                       {NULL, 0, 0}
+               },
+
+               .first_sysupgrade_partition = "os-image",
+               .last_sysupgrade_partition = "file-system"
+       },
+
+       /** Firmware layout for the RE450 v3 */
+       {
+               .id     = "RE450-V3",
+               .vendor = "",
+               .support_list =
+                       "SupportList:\r\n"
+                       "{product_name:RE450,product_ver:3.0.0,special_id:00000000}\r\n"
+                       "{product_name:RE450,product_ver:3.0.0,special_id:55530000}\r\n"
+                       "{product_name:RE450,product_ver:3.0.0,special_id:45550000}\r\n"
+                       "{product_name:RE450,product_ver:3.0.0,special_id:4A500000}\r\n"
+                       "{product_name:RE450,product_ver:3.0.0,special_id:43410000}\r\n"
+                       "{product_name:RE450,product_ver:3.0.0,special_id:41550000}\r\n"
+                       "{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,
+
+               /* 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 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",
+               .support_trail = '\x00',
+               .soft_ver = NULL,
+
+               /* 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",
+               .vendor = "",
+               .support_list =
+                       "SupportList:\r\n"
+                       "{product_name:RE650,product_ver:1.0.0,special_id:00000000}\r\n"
+                       "{product_name:RE650,product_ver:1.0.0,special_id:55530000}\r\n"
+                       "{product_name:RE650,product_ver:1.0.0,special_id:45550000}\r\n"
+                       "{product_name:RE650,product_ver:1.0.0,special_id:4A500000}\r\n"
+                       "{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,
 
+               /* 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}
                },
 
@@ -1198,13 +2289,13 @@ static void set_source_date_epoch() {
        char *env = getenv("SOURCE_DATE_EPOCH");
        char *endptr = env;
        errno = 0;
-        if (env && *env) {
+       if (env && *env) {
                source_date_epoch = strtoull(env, &endptr, 10);
                if (errno || (endptr && *endptr != '\0')) {
                        fprintf(stderr, "Invalid SOURCE_DATE_EPOCH");
                        exit(1);
                }
-        }
+       }
 }
 
 /** Generates the partition-table partition */
@@ -1244,8 +2335,13 @@ 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));
+static struct image_partition_entry make_soft_version(struct device_info *info, uint32_t rev) {
+       size_t part_len = sizeof(struct soft_version);
+       if (info->soft_ver_compat_level > 0)
+               part_len += sizeof(uint32_t);
+
+       struct image_partition_entry entry =
+           alloc_image_partition("soft-version", part_len+1);
        struct soft_version *s = (struct soft_version *)entry.data;
 
        time_t t;
@@ -1255,9 +2351,10 @@ 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);
+       struct tm *tm = gmtime(&t);
 
-       s->magic = htonl(0x0000000c);
+       /* Partition contents size, minus 8 byte header and trailing byte */
+       s->data_len = htonl(entry.size-9);
        s->zero = 0;
        s->pad1 = 0xff;
 
@@ -1271,7 +2368,11 @@ static struct image_partition_entry make_soft_version(uint32_t rev) {
        s->day = bcd(tm->tm_mday);
        s->rev = htonl(rev);
 
-       s->pad2 = 0xff;
+       if (info->soft_ver_compat_level > 0)
+               *(uint32_t *)(entry.data + sizeof(struct soft_version)) =
+                   htonl(info->soft_ver_compat_level);
+
+       entry.data[entry.size-1] = 0xff;
 
        return entry;
 }
@@ -1315,11 +2416,12 @@ static struct image_partition_entry read_file(const char *part_name, const char
 
        size_t len = statbuf.st_size;
 
-       if (add_jffs2_eof)
+       if (add_jffs2_eof) {
                if (file_system_partition)
                        len = ALIGN(len + file_system_partition->base, 0x10000) + sizeof(jffs2_eof_mark) - file_system_partition->base;
                else
                        len = ALIGN(len, 0x10000) + sizeof(jffs2_eof_mark);
+       }
 
        struct image_partition_entry entry = alloc_image_partition(part_name, len);
 
@@ -1582,22 +2684,33 @@ static void build_image(const char *output,
        if (info->soft_ver)
                parts[1] = make_soft_version_from_string(info->soft_ver);
        else
-               parts[1] = make_soft_version(rev);
+               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);
 
        /* Some devices need the extra-para partition to accept the firmware */
-       if (strcasecmp(info->id, "ARCHER-C25-V1") == 0 ||
+       if (strcasecmp(info->id, "ARCHER-C2-V3") == 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, "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-C7-V4") == 0 || strcasecmp(info->id, "ARCHER-C7-V5") == 0) {
+       } 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);
+       } else if (strcasecmp(info->id, "EAP245-V3") == 0) {
+               const char mdat[10] = {0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01};
+               parts[5] = put_data("extra-para", mdat, 10);
        }
 
        size_t len;
@@ -1665,7 +2778,7 @@ static int add_flash_partition(
                unsigned long base,
                unsigned long size)
 {
-       int ptr;
+       size_t ptr;
        /* check if the list has a free entry */
        for (ptr = 0; ptr < max_entries; ptr++, part_list++) {
                if (part_list->name == NULL &&
@@ -1718,7 +2831,7 @@ static int read_partition_table(
        if (fseek(file, offset, SEEK_SET) < 0)
                error(1, errno, "Can not seek in the firmware");
 
-       if (fread(buf, 1, 2048, file) < 0)
+       if (fread(buf, 2048, 1, file) != 1)
                error(1, errno, "Can not read fwup-ptn from the firmware");
 
        buf[2047] = '\0';
@@ -1809,18 +2922,18 @@ static void write_partition(
        fseek(input_file, entry->base + firmware_offset, SEEK_SET);
 
        for (offset = 0; sizeof(buf) + offset <= entry->size; offset += sizeof(buf)) {
-               if (fread(buf, sizeof(buf), 1, input_file) < 0)
+               if (fread(buf, sizeof(buf), 1, input_file) != 1)
                        error(1, errno, "Can not read partition from input_file");
 
-               if (fwrite(buf, sizeof(buf), 1, output_file) < 0)
+               if (fwrite(buf, sizeof(buf), 1, output_file) != 1)
                        error(1, errno, "Can not write partition to output_file");
        }
        /* write last chunk smaller than buffer */
        if (offset < entry->size) {
                offset = entry->size - offset;
-               if (fread(buf, offset, 1, input_file) < 0)
+               if (fread(buf, offset, 1, input_file) != 1)
                        error(1, errno, "Can not read partition from input_file");
-               if (fwrite(buf, offset, 1, output_file) < 0)
+               if (fwrite(buf, offset, 1, output_file) != 1)
                        error(1, errno, "Can not write partition to output_file");
        }
 }
@@ -1873,7 +2986,7 @@ static int extract_firmware(const char *input, const char *output_directory)
                error(1, 0, "Error can not read the partition table (fwup-ptn)");
        }
 
-       for (int i = 0; i < max_entries; i++) {
+       for (size_t i = 0; i < max_entries; i++) {
                if (entries[i].name == NULL &&
                                entries[i].base == 0 &&
                                entries[i].size == 0)
@@ -1889,7 +3002,7 @@ static struct flash_partition_entry *find_partition(
                struct flash_partition_entry *entries, size_t max_entries,
                const char *name, const char *error_msg)
 {
-       for (int i = 0; i < max_entries; i++, entries++) {
+       for (size_t i = 0; i < max_entries; i++, entries++) {
                if (strcmp(entries->name, name) == 0)
                        return entries;
        }
@@ -1901,19 +3014,19 @@ static struct flash_partition_entry *find_partition(
 static void write_ff(FILE *output_file, size_t size)
 {
        char buf[4096];
-       int offset;
+       size_t offset;
 
        memset(buf, 0xff, sizeof(buf));
 
        for (offset = 0; offset + sizeof(buf) < size ; offset += sizeof(buf)) {
-               if (fwrite(buf, sizeof(buf), 1, output_file) < 0)
+               if (fwrite(buf, sizeof(buf), 1, output_file) != 1)
                        error(1, errno, "Can not write 0xff to output_file");
        }
 
        /* write last chunk smaller than buffer */
        if (offset < size) {
                offset = size - offset;
-               if (fwrite(buf, offset, 1, output_file) < 0)
+               if (fwrite(buf, offset, 1, output_file) != 1)
                        error(1, errno, "Can not write partition to output_file");
        }
 }