tools/firmware-utils: use UTC for image timestamps
[openwrt/openwrt.git] / tools / firmware-utils / src / tplink-safeloader.c
index 2e83b71c44e67fbcf184ca78129cbedfe92923d8..0af1fe4c6e2ecf215591e0476459fea226e89949 100644 (file)
@@ -65,7 +65,7 @@ struct image_partition_entry {
 
 /** A flash partition table entry */
 struct flash_partition_entry {
-       const char *name;
+       char *name;
        uint32_t base;
        uint32_t size;
 };
@@ -77,7 +77,7 @@ struct device_info {
        const char *support_list;
        char support_trail;
        const char *soft_ver;
-       const struct flash_partition_entry partitions[MAX_PARTITIONS+1];
+       struct flash_partition_entry partitions[MAX_PARTITIONS+1];
        const char *first_sysupgrade_partition;
        const char *last_sysupgrade_partition;
 };
@@ -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,10 +140,10 @@ static struct device_info boards[] = {
                        {"default-mac", 0x30000, 0x00020},
                        {"product-info", 0x31100, 0x00100},
                        {"signature", 0x32000, 0x00400},
-                       {"os-image", 0x40000, 0x170000},
-                       {"soft-version", 0x1b0000, 0x00100},
-                       {"support-list", 0x1b1000, 0x00400},
-                       {"file-system", 0x1c0000, 0x600000},
+                       {"os-image", 0x40000, 0x200000},
+                       {"file-system", 0x240000, 0x570000},
+                       {"soft-version", 0x7b0000, 0x00100},
+                       {"support-list", 0x7b1000, 0x00400},
                        {"user-config", 0x7c0000, 0x10000},
                        {"default-config", 0x7d0000, 0x10000},
                        {"log", 0x7e0000, 0x10000},
@@ -152,13 +152,177 @@ static struct device_info boards[] = {
                },
 
                .first_sysupgrade_partition = "os-image",
-               .last_sysupgrade_partition = "file-system",
+               .last_sysupgrade_partition = "support-list",
+       },
+
+       /** Firmware layout for the CPE210 V2 */
+       {
+               .id     = "CPE210V2",
+               .vendor = "CPE210(TP-LINK|UN|N300-2|00000000):2.0\r\n",
+               .support_list =
+                       "SupportList:\r\n"
+                       "CPE210(TP-LINK|EU|N300-2|00000000):2.0\r\n"
+                       "CPE210(TP-LINK|EU|N300-2|45550000):2.0\r\n"
+                       "CPE210(TP-LINK|EU|N300-2|55530000):2.0\r\n"
+                       "CPE210(TP-LINK|UN|N300-2|00000000):2.0\r\n"
+                       "CPE210(TP-LINK|UN|N300-2|45550000):2.0\r\n"
+                       "CPE210(TP-LINK|UN|N300-2|55530000):2.0\r\n"
+                       "CPE210(TP-LINK|US|N300-2|55530000):2.0\r\n"
+                       "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,
+
+               .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 CPE210 V3 */
+       {
+               .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 CPE510/520 */
+       /** Firmware layout for the CPE220 V2 */
        {
-               .id     = "CPE510",
-               .vendor = "CPE510(TP-LINK|UN|N300-5):1.0\r\n",
+               .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, 0x200000},
+                       {"file-system", 0x240000, 0x570000},
+                       {"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"
@@ -178,10 +342,10 @@ static struct device_info boards[] = {
                        {"default-mac", 0x30000, 0x00020},
                        {"product-info", 0x31100, 0x00100},
                        {"signature", 0x32000, 0x00400},
-                       {"os-image", 0x40000, 0x170000},
-                       {"soft-version", 0x1b0000, 0x00100},
-                       {"support-list", 0x1b1000, 0x00400},
-                       {"file-system", 0x1c0000, 0x600000},
+                       {"os-image", 0x40000, 0x200000},
+                       {"file-system", 0x240000, 0x570000},
+                       {"soft-version", 0x7b0000, 0x00100},
+                       {"support-list", 0x7b1000, 0x00400},
                        {"user-config", 0x7c0000, 0x10000},
                        {"default-config", 0x7d0000, 0x10000},
                        {"log", 0x7e0000, 0x10000},
@@ -190,12 +354,176 @@ static struct device_info boards[] = {
                },
 
                .first_sysupgrade_partition = "os-image",
-               .last_sysupgrade_partition = "file-system",
+               .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, 0x200000},
+                       {"file-system", 0x240000, 0x570000},
+                       {"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 V3 */
+       {
+               .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, 0x200000},
+                       {"file-system", 0x240000, 0x570000},
+                       {"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     = "WBS210",
-               .vendor = "CPE510(TP-LINK|UN|N300-5):1.0\r\n",
+               .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, 0x200000},
+                       {"file-system", 0x240000, 0x570000},
+                       {"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, 0x200000},
+                       {"file-system", 0x240000, 0x570000},
+                       {"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"
@@ -210,10 +538,10 @@ static struct device_info boards[] = {
                        {"default-mac", 0x30000, 0x00020},
                        {"product-info", 0x31100, 0x00100},
                        {"signature", 0x32000, 0x00400},
-                       {"os-image", 0x40000, 0x170000},
-                       {"soft-version", 0x1b0000, 0x00100},
-                       {"support-list", 0x1b1000, 0x00400},
-                       {"file-system", 0x1c0000, 0x600000},
+                       {"os-image", 0x40000, 0x200000},
+                       {"file-system", 0x240000, 0x570000},
+                       {"soft-version", 0x7b0000, 0x00100},
+                       {"support-list", 0x7b1000, 0x00400},
                        {"user-config", 0x7c0000, 0x10000},
                        {"default-config", 0x7d0000, 0x10000},
                        {"log", 0x7e0000, 0x10000},
@@ -222,17 +550,50 @@ static struct device_info boards[] = {
                },
 
                .first_sysupgrade_partition = "os-image",
-               .last_sysupgrade_partition = "file-system",
+               .last_sysupgrade_partition = "support-list",
        },
 
        {
-               .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, 0x200000},
+                       {"file-system", 0x240000, 0x570000},
+                       {"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,
 
@@ -242,10 +603,10 @@ static struct device_info boards[] = {
                        {"default-mac", 0x30000, 0x00020},
                        {"product-info", 0x31100, 0x00100},
                        {"signature", 0x32000, 0x00400},
-                       {"os-image", 0x40000, 0x170000},
-                       {"soft-version", 0x1b0000, 0x00100},
-                       {"support-list", 0x1b1000, 0x00400},
-                       {"file-system", 0x1c0000, 0x600000},
+                       {"os-image", 0x40000, 0x200000},
+                       {"file-system", 0x240000, 0x570000},
+                       {"soft-version", 0x7b0000, 0x00100},
+                       {"support-list", 0x7b1000, 0x00400},
                        {"user-config", 0x7c0000, 0x10000},
                        {"default-config", 0x7d0000, 0x10000},
                        {"log", 0x7e0000, 0x10000},
@@ -254,12 +615,45 @@ static struct device_info boards[] = {
                },
 
                .first_sysupgrade_partition = "os-image",
-               .last_sysupgrade_partition = "file-system",
+               .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, 0x200000},
+                       {"file-system", 0x240000, 0x570000},
+                       {"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 C2600 */
        {
-               .id = "C2600",
+               .id     = "C2600",
                .vendor = "",
                .support_list =
                        "SupportList:\r\n"
@@ -267,6 +661,11 @@ static struct device_info boards[] = {
                .support_trail = '\x00',
                .soft_ver = NULL,
 
+               /**
+                   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
+                   2 MB os-image since kernel 4.14.
+               */
                .partitions = {
                        {"SBL1", 0x00000, 0x20000},
                        {"MIBIB", 0x20000, 0x20000},
@@ -279,8 +678,8 @@ static struct device_info boards[] = {
                        {"fs-uboot", 0x100000, 0x70000},
                        {"uboot-env", 0x170000, 0x40000},
                        {"radio", 0x1b0000, 0x40000},
-                       {"os-image", 0x1f0000, 0x200000},
-                       {"file-system", 0x3f0000, 0x1b00000},
+                       {"os-image", 0x1f0000, 0x400000}, /* Stock: base 0x1f0000 size 0x200000 */
+                       {"file-system", 0x5f0000, 0x1900000}, /* Stock: base 0x3f0000 size 0x1b00000 */
                        {"default-mac", 0x1ef0000, 0x00200},
                        {"pin", 0x1ef0200, 0x00200},
                        {"product-info", 0x1ef0400, 0x0fc00},
@@ -300,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"
@@ -311,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},
@@ -344,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"
@@ -366,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}
@@ -379,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"
@@ -390,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},
@@ -416,10 +888,120 @@ static struct device_info boards[] = {
                .last_sysupgrade_partition = "file-system",
        },
 
+       /** Firmware layout for the C59v2 */
+       {
+               .id     = "ARCHER-C59-V2",
+               .vendor = "",
+               .support_list =
+                       "SupportList:\r\n"
+                       "{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",
+
+               /** We're using a dynamic kernel/rootfs split here */
+               .partitions = {
+                       {"factory-boot", 0x00000, 0x20000},
+                       {"fs-uboot", 0x20000, 0x10000},
+                       {"default-mac", 0x30000, 0x00200},
+                       {"pin", 0x30200, 0x00200},
+                       {"device-id", 0x30400, 0x00100},
+                       {"product-info", 0x30500, 0x0fb00},
+                       {"firmware", 0x40000, 0xe10000},
+                       {"partition-table", 0xe50000, 0x10000},
+                       {"soft-version", 0xe60000, 0x10000},
+                       {"support-list", 0xe70000, 0x10000},
+                       {"profile", 0xe80000, 0x10000},
+                       {"default-config", 0xe90000, 0x10000},
+                       {"user-config", 0xea0000, 0x40000},
+                       {"usb-config", 0xee0000, 0x10000},
+                       {"certificate", 0xef0000, 0x10000},
+                       {"extra-para", 0xf00000, 0x10000},
+                       {"qos-db", 0xf10000, 0x30000},
+                       {"log", 0xfe0000, 0x10000},
+                       {"radio", 0xff0000, 0x10000},
+                       {NULL, 0, 0}
+               },
+
+               .first_sysupgrade_partition = "os-image",
+               .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.2.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.1.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"
@@ -440,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}
@@ -451,17 +1032,53 @@ static struct device_info boards[] = {
                .last_sysupgrade_partition = "file-system",
        },
 
-       /** Firmware layout for the C60v2 */
+       /** Firmware layout for the C60v2 */
+       {
+               .id     = "ARCHER-C60-V2",
+               .vendor = "",
+               .support_list =
+                       "SupportList:\r\n"
+                       "{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",
+
+               .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},
+                       {"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-V2",
-               .vendor = "",
+               .id     = "ARCHER-C60-V3",
+               .vendor = "",
                .support_list =
                        "SupportList:\r\n"
-                       "{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",
+                       "{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:2.0.0\n",
+               .soft_ver = "soft_ver:3.0.0\n",
 
                .partitions = {
                        {"factory-boot", 0x00000, 0x1fb00},
@@ -470,8 +1087,7 @@ 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},
@@ -490,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"
@@ -525,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"
@@ -541,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},
@@ -573,9 +1185,57 @@ static struct device_info boards[] = {
                .last_sysupgrade_partition = "file-system",
        },
 
+       /** Firmware layout for the 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: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'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,  0x40000},
+
+
+                       {"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 C9 */
        {
-               .id = "ARCHERC9",
+               .id     = "ARCHERC9",
                .vendor = "",
                .support_list =
                        "SupportList:\n"
@@ -663,8 +1323,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},
@@ -734,8 +1393,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},
@@ -767,15 +1425,10 @@ static struct device_info boards[] = {
                .support_trail = '\x00',
                .soft_ver = NULL,
 
-               /**
-                   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 = {
                        {"fs-uboot", 0x00000, 0x20000},
-                       {"os-image", 0x20000, 0x180000},
-                       {"file-system", 0x1a0000, 0xdb0000},
+                       {"firmware", 0x20000, 0xf30000},
                        {"default-mac", 0xf50000, 0x00200},
                        {"pin", 0xf50200, 0x00200},
                        {"product-info", 0xf50400, 0x0fc00},
@@ -811,8 +1464,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},
@@ -844,8 +1496,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},
@@ -868,9 +1519,175 @@ 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 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"
@@ -884,14 +1701,10 @@ static struct device_info boards[] = {
                .support_trail = '\x00',
                .soft_ver = NULL,
 
-               /**
-                       The original os-image partition is too small,
-                       so we enlarge it to 1.6M
-               */
+               /** We're using a dynamic kernel/rootfs split here */
                .partitions = {
                        {"fs-uboot", 0x00000, 0x20000},
-                       {"os-image", 0x20000, 0x1a0000},
-                       {"file-system", 0x1c0000, 0x440000},
+                       {"firmware", 0x20000, 0x5e0000},
                        {"partition-table", 0x600000, 0x02000},
                        {"default-mac", 0x610000, 0x00020},
                        {"pin", 0x610100, 0x00020},
@@ -909,9 +1722,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"
@@ -926,15 +1771,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},
@@ -954,7 +1794,7 @@ static struct device_info boards[] = {
 
        /** Firmware layout for the RE450 */
        {
-               .id = "RE450",
+               .id     = "RE450",
                .vendor = "",
                .support_list =
                        "SupportList:\r\n"
@@ -969,15 +1809,49 @@ 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},
+                       {"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 RE450 v2 */
+       {
+               .id     = "RE450-V2",
+               .vendor = "",
+               .support_list =
+                       "SupportList:\r\n"
+                       "{product_name:RE450,product_ver:2.0.0,special_id:00000000}\r\n"
+                       "{product_name:RE450,product_ver:2.0.0,special_id:55530000}\r\n"
+                       "{product_name:RE450,product_ver:2.0.0,special_id:45550000}\r\n"
+                       "{product_name:RE450,product_ver:2.0.0,special_id:4A500000}\r\n"
+                       "{product_name:RE450,product_ver:2.0.0,special_id:43410000}\r\n"
+                       "{product_name:RE450,product_ver:2.0.0,special_id:41550000}\r\n"
+                       "{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,
+
+               /* 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},
@@ -995,6 +1869,120 @@ static struct device_info boards[] = {
                .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}
+               },
+
+               .first_sysupgrade_partition = "os-image",
+               .last_sysupgrade_partition = "file-system"
+       },
+
        {}
 };
 
@@ -1034,13 +2022,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 */
@@ -1091,7 +2079,7 @@ 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);
        s->zero = 0;
@@ -1130,7 +2118,7 @@ static struct image_partition_entry make_soft_version_from_string(const char *so
 }
 
 /** Generates the support-list partition */
-static struct image_partition_entry make_support_list(const struct device_info *info) {
+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);
 
@@ -1143,7 +2131,7 @@ static struct image_partition_entry make_support_list(const struct device_info *
 }
 
 /** Creates a new image partition with an arbitrary name from a file */
-static struct image_partition_entry read_file(const char *part_name, const char *filename, bool add_jffs2_eof) {
+static struct image_partition_entry read_file(const char *part_name, const char *filename, bool add_jffs2_eof, struct flash_partition_entry *file_system_partition) {
        struct stat statbuf;
 
        if (stat(filename, &statbuf) < 0)
@@ -1151,8 +2139,12 @@ static struct image_partition_entry read_file(const char *part_name, const char
 
        size_t len = statbuf.st_size;
 
-       if (add_jffs2_eof)
-               len = ALIGN(len, 0x10000) + sizeof(jffs2_eof_mark);
+       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);
 
@@ -1268,7 +2260,7 @@ static void put_md5(uint8_t *md5, uint8_t *buffer, unsigned int len) {
      1014-1813    Image partition table (2048 bytes, padded with 0xff)
      1814-xxxx    Firmware partitions
 */
-static void * generate_factory_image(const struct device_info *info, const struct image_partition_entry *parts, size_t *len) {
+static void * generate_factory_image(struct device_info *info, const struct image_partition_entry *parts, size_t *len) {
        *len = 0x1814;
 
        size_t i;
@@ -1301,7 +2293,7 @@ static void * generate_factory_image(const struct device_info *info, const struc
    should be generalized when TP-LINK starts building its safeloader into hardware with
    different flash layouts.
 */
-static void * generate_sysupgrade_image(const struct device_info *info, const struct image_partition_entry *image_parts, size_t *len) {
+static void * generate_sysupgrade_image(struct device_info *info, const struct image_partition_entry *image_parts, size_t *len) {
        size_t i, j;
        size_t flash_first_partition_index = 0;
        size_t flash_last_partition_index = 0;
@@ -1364,10 +2356,53 @@ static void build_image(const char *output,
                uint32_t rev,
                bool add_jffs2_eof,
                bool sysupgrade,
-               const struct device_info *info) {
+               struct device_info *info) {
+
+       size_t i;
 
        struct image_partition_entry parts[7] = {};
 
+       struct flash_partition_entry *firmware_partition = NULL;
+       struct flash_partition_entry *os_image_partition = NULL;
+       struct flash_partition_entry *file_system_partition = NULL;
+       size_t firmware_partition_index = 0;
+
+       for (i = 0; info->partitions[i].name; i++) {
+               if (!strcmp(info->partitions[i].name, "firmware"))
+               {
+                       firmware_partition = &info->partitions[i];
+                       firmware_partition_index = i;
+               }
+       }
+
+       if (firmware_partition)
+       {
+               os_image_partition = &info->partitions[firmware_partition_index];
+               file_system_partition = &info->partitions[firmware_partition_index + 1];
+
+               struct stat kernel;
+               if (stat(kernel_image, &kernel) < 0)
+                       error(1, errno, "unable to stat file `%s'", kernel_image);
+
+               if (kernel.st_size > firmware_partition->size)
+                       error(1, 0, "kernel overflowed firmware partition\n");
+
+               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->base = firmware_partition->base + kernel.st_size;
+
+               /* Align partition start to erase blocks for factory images only */
+               if (!sysupgrade)
+                       file_system_partition->base = ALIGN(firmware_partition->base + kernel.st_size, 0x10000);
+
+               file_system_partition->size = firmware_partition->size - file_system_partition->base;
+
+               os_image_partition->name = "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);
@@ -1375,18 +2410,27 @@ static void build_image(const char *output,
                parts[1] = make_soft_version(rev);
 
        parts[2] = make_support_list(info);
-       parts[3] = read_file("os-image", kernel_image, false);
-       parts[4] = read_file("file-system", rootfs_image, add_jffs2_eof);
+       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) {
+       } 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);
        }
 
        size_t len;
@@ -1407,7 +2451,6 @@ static void build_image(const char *output,
 
        free(image);
 
-       size_t i;
        for (i = 0; parts[i].name; i++)
                free_image_partition(parts[i]);
 }
@@ -1437,7 +2480,7 @@ static void usage(const char *argv0) {
 };
 
 
-static const struct device_info *find_board(const char *id)
+static struct device_info *find_board(const char *id)
 {
        struct device_info *board = NULL;
 
@@ -1455,7 +2498,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 &&
@@ -1469,6 +2512,10 @@ static int add_flash_partition(
        }
 
        part_list->name = calloc(1, strlen(name) + 1);
+       if (!part_list->name) {
+               error(1, 0, "Unable to allocate memory");
+       }
+
        memcpy((char *)part_list->name, name, strlen(name));
        part_list->base = base;
        part_list->size = size;
@@ -1504,7 +2551,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';
@@ -1595,18 +2642,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");
        }
 }
@@ -1659,7 +2706,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)
@@ -1675,7 +2722,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;
        }
@@ -1687,19 +2734,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");
        }
 }
@@ -1767,7 +2814,7 @@ int main(int argc, char *argv[]) {
        const char *extract_image = NULL, *output_directory = NULL, *convert_image = NULL;
        bool add_jffs2_eof = false, sysupgrade = false;
        unsigned rev = 0;
-       const struct device_info *info;
+       struct device_info *info;
        set_source_date_epoch();
 
        while (true) {