OpenWrt – Diff between revs 2 and 3

Subversion Repositories:

?pathlinks?

Rev 2 – Details – Blame – Last modification – View Log

 	uint8_t *data;
 };
 /** A flash partition table entry */
 struct flash_partition_entry {
-	char *name;
+	const char *name;
 	uint32_t base;
 	uint32_t size;
 };
 	const char *id;
 	const char *vendor;
 	const char *support_list;
 	char support_trail;
 	const char *soft_ver;
-	struct flash_partition_entry partitions[MAX_PARTITIONS+1];
+	const struct flash_partition_entry partitions[MAX_PARTITIONS+1];
 	const char *first_sysupgrade_partition;
 	const char *last_sysupgrade_partition;
 };
 			"CPE510(TP-LINK|UN|N300-5):1.1\r\n"
 			"CPE510(TP-LINK|US|N300-5):1.1\r\n"
 			"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",
-			"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|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 = {
 		.first_sysupgrade_partition = "os-image",
 		.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",
 			"{product_name:ArcherC25,product_ver:1.0.0,special_id:55530000}\n"
 			"{product_name:ArcherC25,product_ver:1.0.0,special_id:45550000}\n",
 		.support_trail = '\x00',
 		.soft_ver = "soft_ver:1.0.0\n",
+		/**
+		    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
+MB os-image.
-		/* We're using a dynamic kernel/rootfs split here */
+		*/
 		.partitions = {
 			{"factory-boot", 0x00000, 0x20000},
 			{"fs-uboot", 0x20000, 0x10000},
-			{"firmware", 0x30000, 0x7a0000},	/* Stock: name os-image base 0x30000 size 0x100000 */
+			{"os-image", 0x30000, 0x180000},	/* Stock: base 0x30000 size 0x100000 */
-								/* Stock: name file-system base 0x130000 size 0x6a0000 */
+			{"file-system", 0x1b0000, 0x620000},	/* Stock: base 0x130000 size 0x6a0000 */
 			{"user-config", 0x7d0000, 0x04000},
 			{"default-mac", 0x7e0000, 0x00100},
 			{"device-id", 0x7e0100, 0x00100},
 			{"extra-para", 0x7e0200, 0x00100},
 			{"support-list", 0x11500, 0x00100},
 			{"device-id", 0x11600, 0x00100},
 			{"profile", 0x11700, 0x03900},
 			{"default-config", 0x15000, 0x04000},
 			{"user-config", 0x19000, 0x04000},
-			{"firmware", 0x20000, 0x7c8000},
+			{"os-image", 0x20000, 0x180000},
+			{"file-system", 0x1a0000, 0x648000},
 			{"certyficate", 0x7e8000, 0x08000},
 			{"radio", 0x7f0000, 0x10000},
 			{NULL, 0, 0}
 		},
 			"{product_name:Archer C59,product_ver:1.0.0,special_id:52550000}\r\n"
 			"{product_name:Archer C59,product_ver:1.0.0,special_id:55530000}\r\n",
 		.support_trail = '\x00',
 		.soft_ver = "soft_ver:1.0.0\n",
 		/* 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},
-			{"firmware", 0x20000, 0xe30000},
+			{"file-system", 0x1a0000, 0xcb0000},
 			{"partition-table", 0xe50000, 0x10000},
 			{"soft-version", 0xe60000, 0x10000},
 			{"support-list", 0xe70000, 0x10000},
 			{"profile", 0xe80000, 0x10000},
 		.first_sysupgrade_partition = "os-image",
 		.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 C6v2 */
-	{
-		.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",
-		.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 C60v1 */
+	{
 		.id	= "ARCHER-C60-V1",
 			{"support-list", 0x11500, 0x00100},
 			{"device-id", 0x11600, 0x00100},
 			{"profile", 0x11700, 0x03900},
 			{"default-config", 0x15000, 0x04000},
 			{"user-config", 0x19000, 0x04000},
-			{"firmware", 0x20000, 0x7c8000},
+			{"os-image", 0x20000, 0x180000},
+			{"file-system", 0x1a0000, 0x648000},
 			{"certyficate", 0x7e8000, 0x08000},
 			{"radio", 0x7f0000, 0x10000},
 			{NULL, 0, 0}
 		},
 			{"default-mac", 0x1fb00, 0x00200},
 			{"pin", 0x1fd00, 0x00100},
 			{"product-info", 0x1fe00, 0x00100},
 			{"device-id", 0x1ff00, 0x00100},
 			{"fs-uboot", 0x20000, 0x10000},
-			{"firmware", 0x30000, 0x7a0000},
+			{"os-image", 0x30000, 0x180000},
+			{"file-system", 0x1b0000, 0x620000},
 			{"soft-version", 0x7d9500, 0x00100},
 			{"support-list", 0x7d9600, 0x00100},
 			{"extra-para", 0x7d9700, 0x00100},
 			{"profile", 0x7d9800, 0x03000},
 			{"default-config", 0x7dc800, 0x03000},
 			"{product_name:Archer C7,product_ver:4.0.0,special_id:55530000}\n"
 			"{product_name:Archer C7,product_ver:4.0.0,special_id:43410000}\n",
 		.support_trail = '\x00',
 		.soft_ver = "soft_ver:1.0.0\n",
+		/**
+		    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
+MB os-image.
-		/* 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 */
+			{"os-image", 0x40000, 0x180000},	/* Stock: base 0x40000 size 0x120000 */
-								/* Stock: name file-system base 0x160000 size 0xda0000 */
+			{"file-system", 0x1c0000, 0xd40000},	/* Stock: base 0x160000 size 0xda0000 */
 			{"default-mac", 0xf00000, 0x00200},
 			{"pin", 0xf00200, 0x00200},
 			{"device-id", 0xf00400, 0x00100},
 			{"product-info", 0xf00500, 0x0fb00},
+	{
 		.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: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",
 		.support_trail = '\x00',
+		.soft_ver = "soft_ver:1.0.0\n",
-		.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
 MB os-image.
-		/* We're using a dynamic kernel/rootfs split here */
+		  */
 		.partitions = {
 			{"factory-boot",    0x00000,  0x20000},
 			{"fs-uboot",        0x20000,  0x20000},
 			{"support-list",    0x72000,  0x0a000},
 			{"profile",         0x7c000,  0x04000},
 			{"user-config",     0x80000,  0x40000},
-			{"firmware",        0xc0000,  0xf00000},	/* Stock: name os-image base 0xc0000  size 0x120000 */
+			{"os-image",        0xc0000,  0x180000}, /* Stock: base 0xc0000  size 0x120000 */
-									/* Stock: name file-system base 0x1e0000 size 0xde0000 */
+			{"file-system",     0x240000, 0xd80000}, /* Stock: base 0x1e0000 size 0xde0000 */
 			{"log",             0xfc0000, 0x20000},
 		.support_trail = '\x00',
 		.soft_ver = "soft_ver:1.0.0\n",
 		.partitions = {
 			{"factory-boot", 0x00000, 0x20000},
 			{"fs-uboot", 0x20000, 0x20000},
-			{"firmware", 0x40000, 0xec0000},
+			{"os-image", 0x40000, 0x180000},
+			{"file-system", 0x1c0000, 0xd40000},
 			{"default-mac", 0xf00000, 0x00200},
 			{"pin", 0xf00200, 0x00200},
 			{"device-id", 0xf00400, 0x00100},
 			{"product-info", 0xf00500, 0x0fb00},
 			{"soft-version", 0xf10000, 0x01000},
 			"SupportList:\n"
 			"{product_name:TL-WR1043ND,product_ver:4.0.0,special_id:45550000}\n",
 		.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
+MB os-image.
-		/* We're using a dynamic kernel/rootfs split here */
+		*/
 		.partitions = {
 			{"fs-uboot", 0x00000, 0x20000},
+			{"os-image", 0x20000, 0x180000},
-			{"firmware", 0x20000, 0xf30000},
+			{"file-system", 0x1a0000, 0xdb0000},
 			{"default-mac", 0xf50000, 0x00200},
 			{"pin", 0xf50200, 0x00200},
 			{"product-info", 0xf50400, 0x0fc00},
 			{"soft-version", 0xf60000, 0x0b000},
 KB were moved from file-system to os-image
 		   in comparison to the stock image
 		*/
 		.partitions = {
 			{"fs-uboot", 0x00000, 0x20000},
-			{"firmware", 0x20000, 0x730000},
+			{"os-image", 0x20000, 0x180000},
+			{"file-system", 0x1a0000, 0x5b0000},
 			{"default-mac", 0x750000, 0x00200},
 			{"pin", 0x750200, 0x00200},
 			{"product-info", 0x750400, 0x0fc00},
 			{"soft-version", 0x760000, 0x0b000},
 			{"support-list", 0x76b000, 0x04000},
 		.support_trail = '\x00',
 		.soft_ver = NULL,
 		.partitions = {
 			{"fs-uboot", 0x00000, 0x20000},
+			{"os-image", 0x20000, 0x180000},
-			{"firmware", 0x20000, 0xe20000},
+			{"file-system", 0x1a0000, 0xca0000},
 			{"default-mac", 0xe40000, 0x00200},
 			{"pin", 0xe40200, 0x00200},
 			{"product-info", 0xe40400, 0x0fc00},
 			{"partition-table", 0xe50000, 0x10000},
 			"{product_name:RE350,product_ver:1.0.0,special_id:4b520000}\n"
 			"{product_name:RE350,product_ver:1.0.0,special_id:4a500000}\n",
 		.support_trail = '\x00',
 		.soft_ver = NULL,
+		/**
+			The original os-image partition is too small,
+			so we enlarge it to 1.75M
-		/** We're using a dynamic kernel/rootfs split here */
+		*/
 		.partitions = {
 			{"fs-uboot", 0x00000, 0x20000},
+			{"os-image", 0x20000, 0x1c0000},
-			{"firmware", 0x20000, 0x5e0000},
+			{"file-system", 0x1e0000, 0x420000},
 			{"partition-table", 0x600000, 0x02000},
 			{"default-mac", 0x610000, 0x00020},
 			{"pin", 0x610100, 0x00020},
 			{"product-info", 0x611100, 0x01000},
 			"{product_name:RE355,product_ver:1.0.0,special_id:4B520000}\r\n"
 			"{product_name:RE355,product_ver:1.0.0,special_id:55534100}\r\n",
 		.support_trail = '\x00',
 		.soft_ver = NULL,
+		/**
+		   The flash partition table for RE355;
+		   it is almost the same as the one used by the stock images,
+KB 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},
-			{"firmware", 0x20000, 0x5e0000},
+			{"file-system", 0x1a0000, 0x460000},
 			{"partition-table", 0x600000, 0x02000},
 			{"default-mac", 0x610000, 0x00020},
 			{"pin", 0x610100, 0x00020},
 			{"product-info", 0x611100, 0x01000},
 			"{product_name:RE450,product_ver:1.0.0,special_id:4B520000}\r\n"
 			"{product_name:RE450,product_ver:1.0.0,special_id:55534100}\r\n",
 		.support_trail = '\x00',
 		.soft_ver = NULL,
-		/** 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",
+		   The flash partition table for RE450;
-		.last_sysupgrade_partition = "file-system"
-	},
+		   it is almost the same as the one used by the stock images,
-	/** Firmware layout for the RE450 v2 */
+KB were moved from file-system to os-image.
-	{
-		.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},
-			{"firmware", 0x20000, 0x5e0000},
+			{"file-system", 0x1a0000, 0x460000},
 			{"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},
 			{"radio", 0x7f0000, 0x10000},
 			{NULL, 0, 0}
 		},
 	return entry;
+}
 /** Generates the support-list partition */
-static struct image_partition_entry make_support_list(struct device_info *info) {
+static struct image_partition_entry make_support_list(const struct device_info *info) {
 	size_t len = strlen(info->support_list);
 	struct image_partition_entry entry = alloc_image_partition("support-list", len + 9);
 	return entry;
+}
 /** 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, struct flash_partition_entry *file_system_partition) {
+static struct image_partition_entry read_file(const char *part_name, const char *filename, bool add_jffs2_eof) {
 	struct stat statbuf;
 	if (stat(filename, &statbuf) < 0)
-		error(1, errno, "unable to stat file `%s'", filename);
-	size_t len = statbuf.st_size;
+		error(1, errno, "unable to stat file `%s'", filename);
 	if (add_jffs2_eof)
-		if (file_system_partition)
+	size_t len = statbuf.st_size;
 			len = ALIGN(len + file_system_partition->base, 0x10000) + sizeof(jffs2_eof_mark) - file_system_partition->base;
 -1013    Vendor information (4092 bytes, padded with 0xff; there seem to be older
                   (VxWorks-based) TP-LINK devices which use a smaller vendor information block)
 -1813    Image partition table (2048 bytes, padded with 0xff)
 -xxxx    Firmware partitions
 */
-static void * generate_factory_image(struct device_info *info, const struct image_partition_entry *parts, size_t *len) {
+static void * generate_factory_image(const struct device_info *info, const struct image_partition_entry *parts, size_t *len) {
 	*len = 0x1814;
 	size_t i;
 	for (i = 0; parts[i].name; i++)
    This makes some assumptions about the provided flash and image partition tables and
    should be generalized when TP-LINK starts building its safeloader into hardware with
    different flash layouts.
 */
-static void * generate_sysupgrade_image(struct device_info *info, const struct image_partition_entry *image_parts, size_t *len) {
+static void * generate_sysupgrade_image(const 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;
 	const struct flash_partition_entry *flash_first_partition = NULL;
 		const char *kernel_image,
 		const char *rootfs_image,
 		uint32_t rev,
 		bool add_jffs2_eof,
 		bool sysupgrade,
-		struct device_info *info) {
+		const 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;
 	struct image_partition_entry parts[7] = {};
 	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[2] = make_support_list(info);
-	parts[3] = read_file("os-image", kernel_image, false, NULL);
+	parts[3] = read_file("os-image", kernel_image, false);
-	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 */
+	parts[4] = read_file("file-system", rootfs_image, add_jffs2_eof);
 	if (strcasecmp(info->id, "ARCHER-C2-V3") == 0 ||
-	    strcasecmp(info->id, "ARCHER-C25-V1") == 0 ||
+	/* Some devices need the extra-para partition to accept the firmware */
-	    strcasecmp(info->id, "ARCHER-C59-V2") == 0 ||
+	if (strcasecmp(info->id, "ARCHER-C25-V1") == 0 ||
 	    strcasecmp(info->id, "ARCHER-C60-V2") == 0 ||
 	    strcasecmp(info->id, "TLWR1043NV5") == 0) {
 		const char mdat[11] = {0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00};
-		parts[5] = put_data("extra-para", mdat, 11);
-	} else if (strcasecmp(info->id, "ARCHER-A7-V5") == 0 || strcasecmp(info->id, "ARCHER-C7-V4") == 0 || strcasecmp(info->id, "ARCHER-C7-V5") == 0) {
-		const char mdat[11] = {0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0xca, 0x00, 0x01, 0x00, 0x00};
 		parts[5] = put_data("extra-para", mdat, 11);
-	} else if (strcasecmp(info->id, "ARCHER-C6-V2") == 0) {
+	} else if (strcasecmp(info->id, "ARCHER-C7-V4") == 0 || strcasecmp(info->id, "ARCHER-C7-V5") == 0) {
-		const char mdat[11] = {0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00};
+		const char mdat[11] = {0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0xca, 0x00, 0x01, 0x00, 0x00};
 		parts[5] = put_data("extra-para", mdat, 11);
 	fclose(file);
 	free(image);
 	free(image);
 	size_t i;
 	for (i = 0; parts[i].name; i++)
 		argv0
 	);
 };
-static struct device_info *find_board(const char *id)
+static const struct device_info *find_board(const char *id)
+{
 	struct device_info *board = NULL;
 	if (ptr == max_entries) {
 		error(1, 0, "No free flash part entry available.");
+	}
-	part_list->name = calloc(1, strlen(name) + 1);
-	if (!part_list->name) {
-		error(1, 0, "Unable to allocate memory");
-	}
 	part_list->name = calloc(1, strlen(name) + 1);
 	memcpy((char *)part_list->name, name, strlen(name));
 	part_list->base = base;
 	part_list->size = size;
 int main(int argc, char *argv[]) {
 	const char *board = NULL, *kernel_image = NULL, *rootfs_image = NULL, *output = NULL;
 	const char *extract_image = NULL, *output_directory = NULL, *convert_image = NULL;
 	bool add_jffs2_eof = false, sysupgrade = false;
 	unsigned rev = 0;
-	struct device_info *info;
+	const struct device_info *info;
 	set_source_date_epoch();
 	while (true) {