X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=tools%2Ffirmware-utils%2Fsrc%2Ftplink-safeloader.c;h=b9dfad51a6ddb5d7feac7871ed5af94fe4072f8c;hp=075cd8a7edd1e842622a4843dea5c6e658a12d00;hb=8d4afab0abc3fc0ea8a240077a5b8dddecbfd6eb;hpb=9c01273e5e7b3929ad46d974685ec29de207a8de

diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c
index 075cd8a7ed..b9dfad51a6 100644
--- a/tools/firmware-utils/src/tplink-safeloader.c
+++ b/tools/firmware-utils/src/tplink-safeloader.c
@@ -70,22 +70,36 @@ struct flash_partition_entry {
 	uint32_t size;
 };
 
+/** Partition trailing padding definitions
+ * Values 0x00 to 0xff are reserved to indicate the padding value
+ * Values from 0x100 are reserved to indicate other behaviour */
+enum partition_trail_value {
+	PART_TRAIL_00   = 0x00,
+	PART_TRAIL_FF   = 0xff,
+	PART_TRAIL_MAX  = 0xff,
+	PART_TRAIL_NONE = 0x100
+};
+
 /** Firmware layout description */
 struct device_info {
 	const char *id;
 	const char *vendor;
 	const char *support_list;
-	char support_trail;
+	enum partition_trail_value part_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;
 };
 
+struct __attribute__((__packed__)) meta_header {
+	uint32_t length;
+	uint32_t zero;
+};
+
 /** The content of the soft-version structure */
 struct __attribute__((__packed__)) soft_version {
-	uint32_t magic;
-	uint32_t zero;
 	uint8_t pad1;
 	uint8_t version_major;
 	uint8_t version_minor;
@@ -95,7 +109,7 @@ struct __attribute__((__packed__)) soft_version {
 	uint8_t month;
 	uint8_t day;
 	uint32_t rev;
-	uint8_t pad2;
+	uint32_t compat_level;
 };
 
 
@@ -118,10 +132,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"
@@ -131,7 +145,7 @@ static struct device_info boards[] = {
 			"CPE220(TP-LINK|UN|N300-2):1.1\r\n"
 			"CPE220(TP-LINK|US|N300-2):1.1\r\n"
 			"CPE220(TP-LINK|EU|N300-2):1.1\r\n",
-		.support_trail = '\xff',
+		.part_trail = 0xff,
 		.soft_ver = NULL,
 
 		.partitions = {
@@ -140,8 +154,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},
@@ -171,7 +185,130 @@ static struct device_info boards[] = {
 			"CPE210(TP-LINK|UN|N300-2):2.0\r\n"
 			"CPE210(TP-LINK|EU|N300-2):2.0\r\n"
 			"CPE210(TP-LINK|US|N300-2):2.0\r\n",
-		.support_trail = '\xff',
+		.part_trail = 0xff,
+		.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",
+		.part_trail = 0xff,
+		.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",
+		.part_trail = 0xff,
+		.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",
+		.part_trail = 0xff,
 		.soft_ver = NULL,
 
 		.partitions = {
@@ -182,8 +319,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 +333,10 @@ static struct device_info boards[] = {
 		.last_sysupgrade_partition = "support-list",
 	},
 
-	/** Firmware layout for the CPE510/520 */
+	/** Firmware layout for the CPE510/520 V1 */
 	{
-		.id	= "CPE510",
-		.vendor	= "CPE510(TP-LINK|UN|N300-5):1.0\r\n",
+		.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"
@@ -210,18 +346,50 @@ static struct device_info boards[] = {
 			"CPE510(TP-LINK|EU|N300-5):1.1\r\n"
 			"CPE520(TP-LINK|UN|N300-5):1.1\r\n"
 			"CPE520(TP-LINK|US|N300-5):1.1\r\n"
-			"CPE520(TP-LINK|EU|N300-5):1.1\r\n"
+			"CPE520(TP-LINK|EU|N300-5):1.1\r\n",
+		.part_trail = 0xff,
+		.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 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',
+		.part_trail = 0xff,
 		.soft_ver = NULL,
 
 		.partitions = {
@@ -230,8 +398,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},
@@ -245,15 +413,140 @@ 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"
+			"CPE510(TP-LINK|UN|N300-5|00000000):3.20\r\n"
+			"CPE510(TP-LINK|US|N300-5|55530000):3.20\r\n"
+			"CPE510(TP-LINK|EU|N300-5|45550000):3.20\r\n",
+		.part_trail = 0xff,
+		.soft_ver = 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",
+		.part_trail = 0xff,
+		.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",
+		.part_trail = 0xff,
+		.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"
 			"WBS210(TP-LINK|US|N300-2):1.20\r\n"
 			"WBS210(TP-LINK|EU|N300-2):1.20\r\n",
-		.support_trail = '\xff',
+		.part_trail = 0xff,
 		.soft_ver = NULL,
 
 		.partitions = {
@@ -262,8 +555,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},
@@ -278,14 +571,47 @@ 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",
+		.part_trail = 0xff,
+		.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",
-		.support_trail = '\xff',
+			"WBS510(TP-LINK|EU|N300-5):1.20\r\n"
+			"WBS510(TP-LINK|CA|N300-5):1.20\r\n",
+		.part_trail = 0xff,
 		.soft_ver = NULL,
 
 		.partitions = {
@@ -294,8 +620,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},
@@ -309,14 +635,91 @@ static struct device_info boards[] = {
 		.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",
+		.part_trail = 0xff,
+		.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 AD7200 */
+	{
+		.id = "AD7200",
+		.vendor = "",
+		.support_list =
+			"SupportList:\r\n"
+			"{product_name:Talon AD7200,product_ver:1.0.0,special_id:00000000}\r\n",
+		.part_trail = 0x00,
+		.soft_ver = NULL,
+
+		.partitions = {
+			{"SBL1", 0x00000, 0x20000},
+			{"MIBIB", 0x20000, 0x20000},
+			{"SBL2", 0x40000, 0x20000},
+			{"SBL3", 0x60000, 0x30000},
+			{"DDRCONFIG", 0x90000, 0x10000},
+			{"SSD", 0xa0000, 0x10000},
+			{"TZ", 0xb0000, 0x30000},
+			{"RPM", 0xe0000, 0x20000},
+			{"fs-uboot", 0x100000, 0x70000},
+			{"uboot-env", 0x170000, 0x40000},
+			{"radio", 0x1b0000, 0x40000},
+			{"os-image", 0x1f0000, 0x400000},
+			{"file-system", 0x5f0000, 0x1900000},
+			{"default-mac", 0x1ef0000, 0x00200},
+			{"pin", 0x1ef0200, 0x00200},
+			{"device-id", 0x1ef0400, 0x00200},
+			{"product-info", 0x1ef0600, 0x0fa00},
+			{"partition-table", 0x1f00000, 0x10000},
+			{"soft-version", 0x1f10000, 0x10000},
+			{"support-list", 0x1f20000, 0x10000},
+			{"profile", 0x1f30000, 0x10000},
+			{"default-config", 0x1f40000, 0x10000},
+			{"user-config", 0x1f50000, 0x40000},
+			{"qos-db", 0x1f90000, 0x40000},
+			{"usb-config", 0x1fd0000, 0x10000},
+			{"log", 0x1fe0000, 0x20000},
+			{NULL, 0, 0}
+		},
+
+		.first_sysupgrade_partition = "os-image",
+		.last_sysupgrade_partition = "file-system"
+	},
+
 	/** Firmware layout for the C2600 */
 	{
-		.id = "C2600",
+		.id     = "C2600",
 		.vendor = "",
 		.support_list =
 			"SupportList:\r\n"
 			"{product_name:Archer C2600,product_ver:1.0.0,special_id:00000000}\r\n",
-		.support_trail = '\x00',
+		.part_trail = 0x00,
 		.soft_ver = NULL,
 
 		/**
@@ -359,15 +762,16 @@ static struct device_info boards[] = {
 
 	/** Firmware layout for the A7-V5 */
 	{
-		.id = "ARCHER-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',
+			"{product_name:Archer A7,product_ver:5.0.0,special_id:54570000}\n"
+			"{product_name:Archer A7,product_ver:5.0.0,special_id:52550000}\n",
+		.part_trail = 0x00,
 		.soft_ver = "soft_ver:1.0.0\n",
 
 		/* We're using a dynamic kernel/rootfs split here */
@@ -399,13 +803,13 @@ static struct device_info boards[] = {
 
 	/** Firmware layout for the C2v3 */
 	{
-		.id = "ARCHER-C2-V3",
+		.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',
+		.part_trail = 0x00,
 		.soft_ver = "soft_ver:3.0.1\n",
 
 		/** We're using a dynamic kernel/rootfs split here */
@@ -437,13 +841,13 @@ static struct device_info boards[] = {
 
 	/** 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"
 			"{product_name:ArcherC25,product_ver:1.0.0,special_id:55530000}\n"
 			"{product_name:ArcherC25,product_ver:1.0.0,special_id:45550000}\n",
-		.support_trail = '\x00',
+		.part_trail = 0x00,
 		.soft_ver = "soft_ver:1.0.0\n",
 
 		/* We're using a dynamic kernel/rootfs split here */
@@ -475,14 +879,14 @@ 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"
 			"{product_name:Archer C58,product_ver:1.0.0,special_id:45550000}\r\n"
 			"{product_name:Archer C58,product_ver:1.0.0,special_id:55530000}\r\n",
-		.support_trail = '\x00',
+		.part_trail = 0x00,
 		.soft_ver = "soft_ver:1.0.0\n",
 
 		.partitions = {
@@ -509,15 +913,15 @@ 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"
 			"{product_name:Archer C59,product_ver:1.0.0,special_id:45550000}\r\n"
 			"{product_name:Archer C59,product_ver:1.0.0,special_id:52550000}\r\n"
 			"{product_name:Archer C59,product_ver:1.0.0,special_id:55530000}\r\n",
-		.support_trail = '\x00',
+		.part_trail = 0x00,
 		.soft_ver = "soft_ver:1.0.0\n",
 
 		/* We're using a dynamic kernel/rootfs split here */
@@ -548,14 +952,14 @@ 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"
 			"{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',
+		.part_trail = 0x00,
 		.soft_ver = "soft_ver:2.0.0 Build 20161206 rel.7303\n",
 
 		/** We're using a dynamic kernel/rootfs split here */
@@ -586,17 +990,17 @@ static struct device_info boards[] = {
 		.last_sysupgrade_partition = "file-system",
 	},
 
-	/** Firmware layout for the C6v2 */
+	/** Firmware layout for the Archer C6 v2 (EU/RU/JP) */
 	{
-		.id	= "ARCHER-C6-V2",
-		.vendor	= "",
+		.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.0.0\n",
+		.part_trail = 0x00,
+		.soft_ver = "soft_ver:1.9.1\n",
 
 		.partitions = {
 			{"fs-uboot", 0x00000, 0x20000},
@@ -621,17 +1025,51 @@ static struct device_info boards[] = {
 		.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",
+		.part_trail = 0x00,
+		.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"
 			"{product_name:Archer C60,product_ver:1.0.0,special_id:45550000}\r\n"
 			"{product_name:Archer C60,product_ver:1.0.0,special_id:55530000}\r\n",
-		.support_trail = '\x00',
+		.part_trail = 0x00,
 		.soft_ver = "soft_ver:1.0.0\n",
 
 		.partitions = {
@@ -658,14 +1096,14 @@ 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"
 			"{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',
+		.part_trail = 0x00,
 		.soft_ver = "soft_ver:2.0.0\n",
 
 		.partitions = {
@@ -692,16 +1130,52 @@ static struct device_info boards[] = {
 		.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",
+		.part_trail = 0x00,
+		.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},
+			{"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 C5 */
 	{
-		.id = "ARCHER-C5-V2",
+		.id     = "ARCHER-C5-V2",
 		.vendor = "",
 		.support_list =
 			"SupportList:\r\n"
 			"{product_name:ArcherC5,product_ver:2.0.0,special_id:00000000}\r\n"
 			"{product_name:ArcherC5,product_ver:2.0.0,special_id:55530000}\r\n"
 			"{product_name:ArcherC5,product_ver:2.0.0,special_id:4A500000}\r\n", /* JP version */
-		.support_trail = '\x00',
+		.part_trail = 0x00,
 		.soft_ver = NULL,
 
 		.partitions = {
@@ -729,7 +1203,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"
@@ -742,7 +1216,7 @@ static struct device_info boards[] = {
 			"{product_name:Archer C7,product_ver:4.0.0,special_id:54570000}\n"
 			"{product_name:Archer C7,product_ver:4.0.0,special_id:55530000}\n"
 			"{product_name:Archer C7,product_ver:4.0.0,special_id:43410000}\n",
-		.support_trail = '\x00',
+		.part_trail = 0x00,
 		.soft_ver = "soft_ver:1.0.0\n",
 
 		/* We're using a dynamic kernel/rootfs split here */
@@ -775,7 +1249,7 @@ 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"
@@ -784,9 +1258,10 @@ static struct device_info boards[] = {
 			"{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:52550000}\n"
+			"{product_name:Archer C7,product_ver:5.0.0,special_id:4B520000}\n",
 
-		.support_trail = '\x00',
+		.part_trail = 0x00,
 		.soft_ver = "soft_ver:1.0.0\n",
 
 		/* We're using a dynamic kernel/rootfs split here */
@@ -822,14 +1297,14 @@ static struct device_info boards[] = {
 
 	/** Firmware layout for the C9 */
 	{
-		.id = "ARCHERC9",
+		.id     = "ARCHERC9",
 		.vendor = "",
 		.support_list =
 			"SupportList:\n"
 			"{product_name:ArcherC9,"
 			"product_ver:1.0.0,"
 			"special_id:00000000}\n",
-		.support_trail = '\x00',
+		.part_trail = 0x00,
 		.soft_ver = NULL,
 
 		.partitions = {
@@ -862,7 +1337,7 @@ static struct device_info boards[] = {
 		.support_list =
 			"SupportList:\r\n"
 			"EAP120(TP-LINK|UN|N300-2):1.0\r\n",
-		.support_trail = '\xff',
+		.part_trail = 0xff,
 		.soft_ver = NULL,
 
 		.partitions = {
@@ -885,6 +1360,151 @@ static struct device_info boards[] = {
 		.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",
+		.part_trail = PART_TRAIL_NONE,
+		.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 v3 */
+	{
+		.id     = "EAP225-V3",
+		.support_list =
+			"SupportList:\r\n"
+			"EAP225(TP-Link|UN|AC1350-D):3.0\r\n",
+		.part_trail = PART_TRAIL_NONE,
+		.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",
+		.part_trail = PART_TRAIL_NONE,
+		.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",
+		.part_trail = PART_TRAIL_NONE,
+		.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     = "EAP245-V3",
+		.support_list =
+			"SupportList:\r\n"
+			"EAP245(TP-Link|UN|AC1750-D):3.0\r\n",
+		.part_trail = PART_TRAIL_NONE,
+		.soft_ver = NULL,
+		.soft_ver_compat_level = 1,
+
+		/** Firmware partition with dynamic kernel/rootfs split */
+		.partitions = {
+			{"factroy-boot", 0x00000, 0x40000},
+			{"fs-uboot", 0x40000, 0x40000},
+			{"partition-table", 0x80000, 0x10000},
+			{"default-mac", 0x90000, 0x01000},
+			{"support-list", 0x91000, 0x00100},
+			{"product-info", 0x91100, 0x00400},
+			{"soft-version", 0x92000, 0x00100},
+			{"radio", 0xa0000, 0x10000},
+			{"extra-para", 0xb0000, 0x10000},
+			{"firmware", 0xc0000, 0xe40000},
+			{"config", 0xf00000, 0x30000},
+			{"mutil-log", 0xf30000, 0x80000},
+			{"oops", 0xfb0000, 0x40000},
+			{NULL, 0, 0}
+		},
+
+		.first_sysupgrade_partition = "os-image",
+		.last_sysupgrade_partition = "file-system"
+	},
+
 	/** Firmware layout for the TL-WA850RE v2 */
 	{
 		.id     = "TLWA850REV2",
@@ -901,7 +1521,7 @@ static struct device_info boards[] = {
 			"{product_name:TL-WA850RE,product_ver:2.0.0,special_id:43410000}\n"
 			"{product_name:TL-WA850RE,product_ver:2.0.0,special_id:41550000}\n"
 			"{product_name:TL-WA850RE,product_ver:2.0.0,special_id:52550000}\n",
-		.support_trail = '\x00',
+		.part_trail = 0x00,
 		.soft_ver = NULL,
 
 		/**
@@ -910,8 +1530,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},
@@ -944,7 +1563,7 @@ static struct device_info boards[] = {
 			"{product_name:TL-WA855RE,product_ver:1.0.0,special_id:43410000}\n"
 			"{product_name:TL-WA855RE,product_ver:1.0.0,special_id:41550000}\n"
 			"{product_name:TL-WA855RE,product_ver:1.0.0,special_id:52550000}\n",
-		.support_trail = '\x00',
+		.part_trail = 0x00,
 		.soft_ver = NULL,
 
 		.partitions = {
@@ -968,6 +1587,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",
+		.part_trail = 0x00,
+		.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",
+		.part_trail = 0x00,
+		.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",
+		.part_trail = 0x00,
+		.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",
@@ -976,7 +1702,7 @@ static struct device_info boards[] = {
 			"SupportList:\n"
 			"{product_name:TL-WR1043N,product_ver:5.0.0,special_id:45550000}\n"
 			"{product_name:TL-WR1043N,product_ver:5.0.0,special_id:55530000}\n",
-		.support_trail = '\x00',
+		.part_trail = 0x00,
 		.soft_ver = "soft_ver:1.0.0\n",
 		.partitions = {
 			{"factory-boot", 0x00000, 0x20000},
@@ -1010,7 +1736,7 @@ static struct device_info boards[] = {
 		.support_list =
 			"SupportList:\n"
 			"{product_name:TL-WR1043ND,product_ver:4.0.0,special_id:45550000}\n",
-		.support_trail = '\x00',
+		.part_trail = 0x00,
 		.soft_ver = NULL,
 
 		/* We're using a dynamic kernel/rootfs split here */
@@ -1043,7 +1769,7 @@ static struct device_info boards[] = {
 			"SupportList:\n"
 			"{product_name:TL-WR902AC,product_ver:1.0.0,special_id:45550000}\n"
 			"{product_name:TL-WR902AC,product_ver:1.0.0,special_id:55530000}\n",
-		.support_trail = '\x00',
+		.part_trail = 0x00,
 		.soft_ver = NULL,
 
 		/**
@@ -1079,7 +1805,7 @@ static struct device_info boards[] = {
 			"SupportList:\r\n"
 			"{product_name:TL-WR942N,product_ver:1.0.0,special_id:00000000}\r\n"
 			"{product_name:TL-WR942N,product_ver:1.0.0,special_id:52550000}\r\n",
-		.support_trail = '\x00',
+		.part_trail = 0x00,
 		.soft_ver = NULL,
 
 		.partitions = {
@@ -1107,9 +1833,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",
+		.part_trail = 0x00,
+		.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",
+		.part_trail = 0x00,
+		.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",
+		.part_trail = 0x00,
+		.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",
+		.part_trail = 0x00,
+		.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",
+		.part_trail = 0x00,
+		.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"
@@ -1120,7 +2056,7 @@ static struct device_info boards[] = {
 			"{product_name:RE350,product_ver:1.0.0,special_id:43410000}\n"
 			"{product_name:RE350,product_ver:1.0.0,special_id:4b520000}\n"
 			"{product_name:RE350,product_ver:1.0.0,special_id:4a500000}\n",
-		.support_trail = '\x00',
+		.part_trail = 0x00,
 		.soft_ver = NULL,
 
 		/** We're using a dynamic kernel/rootfs split here */
@@ -1144,9 +2080,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",
+		.part_trail = 0x00,
+		.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"
@@ -1158,7 +2126,7 @@ static struct device_info boards[] = {
 			"{product_name:RE355,product_ver:1.0.0,special_id:41550000}\r\n"
 			"{product_name:RE355,product_ver:1.0.0,special_id:4B520000}\r\n"
 			"{product_name:RE355,product_ver:1.0.0,special_id:55534100}\r\n",
-		.support_trail = '\x00',
+		.part_trail = 0x00,
 		.soft_ver = NULL,
 
 		/* We're using a dynamic kernel/rootfs split here */
@@ -1184,7 +2152,7 @@ static struct device_info boards[] = {
 
 	/** Firmware layout for the RE450 */
 	{
-		.id = "RE450",
+		.id     = "RE450",
 		.vendor = "",
 		.support_list =
 			"SupportList:\r\n"
@@ -1196,7 +2164,7 @@ static struct device_info boards[] = {
 			"{product_name:RE450,product_ver:1.0.0,special_id:41550000}\r\n"
 			"{product_name:RE450,product_ver:1.0.0,special_id:4B520000}\r\n"
 			"{product_name:RE450,product_ver:1.0.0,special_id:55534100}\r\n",
-		.support_trail = '\x00',
+		.part_trail = 0x00,
 		.soft_ver = NULL,
 
 		/** We're using a dynamic kernel/rootfs split here */
@@ -1222,7 +2190,7 @@ static struct device_info boards[] = {
 
 	/** Firmware layout for the RE450 v2 */
 	{
-		.id = "RE450-V2",
+		.id     = "RE450-V2",
 		.vendor = "",
 		.support_list =
 			"SupportList:\r\n"
@@ -1235,7 +2203,7 @@ static struct device_info boards[] = {
 			"{product_name:RE450,product_ver:2.0.0,special_id:41530000}\r\n"
 			"{product_name:RE450,product_ver:2.0.0,special_id:4B520000}\r\n"
 			"{product_name:RE450,product_ver:2.0.0,special_id:42520000}\r\n",
-		.support_trail = '\x00',
+		.part_trail = 0x00,
 		.soft_ver = NULL,
 
 		/* We're using a dynamic kernel/rootfs split here */
@@ -1252,7 +2220,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",
+		.part_trail = 0x00,
+		.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",
+		.part_trail = 0x00,
+		.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",
+		.part_trail = 0x00,
+		.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}
 		},
 
@@ -1280,6 +2361,44 @@ static inline void put32(uint8_t *buf, uint32_t val) {
 	buf[3] = val;
 }
 
+static inline bool meta_partition_should_pad(enum partition_trail_value pv)
+{
+	return (pv >= 0) && (pv <= PART_TRAIL_MAX);
+}
+
+/** Allocate a padded meta partition with a correctly initialised header
+ * If the `data` pointer is NULL, then the required space is only allocated,
+ * otherwise `data_len` bytes will be copied from `data` into the partition
+ * entry. */
+static struct image_partition_entry init_meta_partition_entry(
+	const char *name, const void *data, uint32_t data_len,
+	enum partition_trail_value pad_value)
+{
+	uint32_t total_len = sizeof(struct meta_header) + data_len;
+	if (meta_partition_should_pad(pad_value))
+		total_len += 1;
+
+	struct image_partition_entry entry = {
+		.name = name,
+		.size = total_len,
+		.data = malloc(total_len)
+	};
+	if (!entry.data)
+		error(1, errno, "failed to allocate meta partition entry");
+
+	struct meta_header *header = (struct meta_header *)entry.data;
+	header->length = htonl(data_len);
+	header->zero = 0;
+
+	if (data)
+		memcpy(entry.data+sizeof(*header), data, data_len);
+
+	if (meta_partition_should_pad(pad_value))
+		entry.data[total_len - 1] = (uint8_t) pad_value;
+
+	return entry;
+}
+
 /** Allocates a new image partition */
 static struct image_partition_entry alloc_image_partition(const char *name, size_t len) {
 	struct image_partition_entry entry = {name, len, malloc(len)};
@@ -1299,13 +2418,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 */
@@ -1345,9 +2464,16 @@ static inline uint8_t bcd(uint8_t v) {
 
 
 /** Generates the soft-version partition */
-static struct image_partition_entry make_soft_version(uint32_t rev) {
-	struct image_partition_entry entry = alloc_image_partition("soft-version", sizeof(struct soft_version));
-	struct soft_version *s = (struct soft_version *)entry.data;
+static struct image_partition_entry make_soft_version(
+	const struct device_info *info, uint32_t rev)
+{
+	/** If an info string is provided, use this instead of
+	 * the structured data, and include the null-termination */
+	if (info->soft_ver) {
+		uint32_t len = strlen(info->soft_ver) + 1;
+		return init_meta_partition_entry("soft-version",
+			info->soft_ver, len, info->part_trail);
+	}
 
 	time_t t;
 
@@ -1356,55 +2482,47 @@ static struct image_partition_entry make_soft_version(uint32_t rev) {
 	else if (time(&t) == (time_t)(-1))
 		error(1, errno, "time");
 
-	struct tm *tm = localtime(&t);
-
-	s->magic = htonl(0x0000000c);
-	s->zero = 0;
-	s->pad1 = 0xff;
+	struct tm *tm = gmtime(&t);
 
-	s->version_major = 0;
-	s->version_minor = 0;
-	s->version_patch = 0;
+	struct soft_version s = {
+		.pad1 = 0xff,
 
-	s->year_hi = bcd((1900+tm->tm_year)/100);
-	s->year_lo = bcd(tm->tm_year%100);
-	s->month = bcd(tm->tm_mon+1);
-	s->day = bcd(tm->tm_mday);
-	s->rev = htonl(rev);
+		.version_major = 0,
+		.version_minor = 0,
+		.version_patch = 0,
 
-	s->pad2 = 0xff;
+		.year_hi = bcd((1900+tm->tm_year)/100),
+		.year_lo = bcd(tm->tm_year%100),
+		.month = bcd(tm->tm_mon+1),
+		.day = bcd(tm->tm_mday),
 
-	return entry;
-}
-
-static struct image_partition_entry make_soft_version_from_string(const char *soft_ver) {
-	/** String length _including_ the terminating zero byte */
-	uint32_t ver_len = strlen(soft_ver) + 1;
-	/** Partition contains 64 bit header, the version string, and one additional null byte */
-	size_t partition_len = 2*sizeof(uint32_t) + ver_len + 1;
-	struct image_partition_entry entry = alloc_image_partition("soft-version", partition_len);
-
-	uint32_t *len = (uint32_t *)entry.data;
-	len[0] = htonl(ver_len);
-	len[1] = 0;
-	memcpy(&len[2], soft_ver, ver_len);
+		.compat_level = htonl(info->soft_ver_compat_level)
+	};
 
-	entry.data[partition_len - 1] = 0;
-
-	return entry;
+	if (info->soft_ver_compat_level == 0)
+		return init_meta_partition_entry("soft-version", &s,
+			(uint8_t *)(&s.compat_level) - (uint8_t *)(&s),
+			info->part_trail);
+	else
+		return init_meta_partition_entry("soft-version", &s,
+			sizeof(s), info->part_trail);
 }
 
 /** Generates the support-list partition */
-static struct image_partition_entry make_support_list(struct device_info *info) {
-	size_t len = strlen(info->support_list);
-	struct image_partition_entry entry = alloc_image_partition("support-list", len + 9);
-
-	put32(entry.data, len);
-	memset(entry.data+4, 0, 4);
-	memcpy(entry.data+8, info->support_list, len);
-	entry.data[len+8] = info->support_trail;
+static struct image_partition_entry make_support_list(
+	const struct device_info *info)
+{
+	uint32_t len = strlen(info->support_list);
+	return init_meta_partition_entry("support-list", info->support_list,
+		len, info->part_trail);
+}
 
-	return entry;
+/** Partition with extra-para data */
+static struct image_partition_entry make_extra_para(
+	const struct device_info *info, const uint8_t *extra_para, size_t len)
+{
+	return init_meta_partition_entry("extra-para", extra_para, len,
+		info->part_trail);
 }
 
 /** Creates a new image partition with an arbitrary name from a file */
@@ -1416,11 +2534,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);
 
@@ -1443,16 +2562,6 @@ static struct image_partition_entry read_file(const char *part_name, const char
 	return entry;
 }
 
-/** Creates a new image partition from arbitrary data */
-static struct image_partition_entry put_data(const char *part_name, const char *datain, size_t len) {
-
-	struct image_partition_entry entry = alloc_image_partition(part_name, len);
-
-	memcpy(entry.data, datain, len);
-
-	return entry;
-}
-
 /**
    Copies a list of image partitions into an image buffer and generates the image partition table while doing so
 
@@ -1680,29 +2789,33 @@ static void build_image(const char *output,
 	}
 
 	parts[0] = make_partition_table(info->partitions);
-	if (info->soft_ver)
-		parts[1] = make_soft_version_from_string(info->soft_ver);
-	else
-		parts[1] = make_soft_version(rev);
-
+	parts[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-C2-V3") == 0 ||
+	if (strcasecmp(info->id, "ARCHER-A7-V5") == 0 ||
+	    strcasecmp(info->id, "ARCHER-C2-V3") == 0 ||
+	    strcasecmp(info->id, "ARCHER-C7-V4") == 0 ||
+	    strcasecmp(info->id, "ARCHER-C7-V5") == 0 ||
 	    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-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);
+		const uint8_t extra_para[2] = {0x01, 0x00};
+		parts[5] = make_extra_para(info, extra_para,
+			sizeof(extra_para));
 	} else if (strcasecmp(info->id, "ARCHER-C6-V2") == 0) {
-		const char mdat[11] = {0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00};
-		parts[5] = put_data("extra-para", mdat, 11);
+		const uint8_t extra_para[2] = {0x00, 0x01};
+		parts[5] = make_extra_para(info, extra_para,
+			sizeof(extra_para));
+	} else if (strcasecmp(info->id, "ARCHER-C6-V2-US") == 0 ||
+		   strcasecmp(info->id, "EAP245-V3") == 0) {
+		const uint8_t extra_para[2] = {0x01, 0x01};
+		parts[5] = make_extra_para(info, extra_para,
+			sizeof(extra_para));
 	}
 
 	size_t len;
@@ -1770,7 +2883,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 &&
@@ -1823,7 +2936,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';
@@ -1914,18 +3027,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");
 	}
 }
@@ -1978,7 +3091,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)
@@ -1994,7 +3107,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;
 	}
@@ -2006,19 +3119,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");
 	}
 }