OpenWrt – Diff between revs 2 and 3

Subversion Repositories:

?pathlinks?

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

Only display areas with differences – Ignore whitespace

 /*
   Copyright (c) 2014, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
 . Redistributions of source code must retain the above copyright notice,
        this list of conditions and the following disclaimer.
 . Redistributions in binary form must reproduce the above copyright notice,
        this list of conditions and the following disclaimer in the documentation
        and/or other materials provided with the distribution.
   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
   FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
   CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 /*
    tplink-safeloader
    Image generation tool for the TP-LINK SafeLoader as seen on
    TP-LINK Pharos devices (CPE210/220/510/520)
 */
 #include <assert.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
 #include <arpa/inet.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <limits.h>
 #include "md5.h"
 #define ALIGN(x,a) ({ typeof(a) __a = (a); (((x) + __a - 1) & ~(__a - 1)); })
 #define MAX_PARTITIONS	32
 /** An image partition table entry */
 struct image_partition_entry {
 	const char *name;
 	size_t size;
 	uint8_t *data;
 };
 /** A flash partition table entry */
 struct flash_partition_entry {
-	char *name;
+	const char *name;
 	uint32_t base;
 	uint32_t size;
 };
 /** Firmware layout description */
 struct device_info {
 	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;
 };
 /** 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;
 	uint8_t version_patch;
 	uint8_t year_hi;
 	uint8_t year_lo;
 	uint8_t month;
 	uint8_t day;
 	uint32_t rev;
 	uint8_t pad2;
 };
 static const uint8_t jffs2_eof_mark[4] = {0xde, 0xad, 0xc0, 0xde};
 /**
    Salt for the MD5 hash
    Fortunately, TP-LINK seems to use the same salt for most devices which use
    the new image format.
 */
 static const uint8_t md5_salt[16] = {
 x7a, 0x2b, 0x15, 0xed,
 x9b, 0x98, 0x59, 0x6d,
 xe5, 0x04, 0xab, 0x44,
 xac, 0x2a, 0x9f, 0x4e,
 };
 /** Firmware layout table */
 static struct device_info boards[] = {
 	/** Firmware layout for the CPE210/220 */
+	{
 		.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"
 			"CPE210(TP-LINK|UN|N300-2):1.1\r\n"
 			"CPE210(TP-LINK|US|N300-2):1.1\r\n"
 			"CPE210(TP-LINK|EU|N300-2):1.1\r\n"
 			"CPE220(TP-LINK|UN|N300-2):1.1\r\n"
 			"CPE220(TP-LINK|US|N300-2):1.1\r\n"
 			"CPE220(TP-LINK|EU|N300-2):1.1\r\n",
 		.support_trail = '\xff',
 		.soft_ver = NULL,
 		.partitions = {
 			{"fs-uboot", 0x00000, 0x20000},
 			{"partition-table", 0x20000, 0x02000},
 			{"default-mac", 0x30000, 0x00020},
 			{"product-info", 0x31100, 0x00100},
 			{"signature", 0x32000, 0x00400},
 			{"os-image", 0x40000, 0x1c0000},
 			{"file-system", 0x200000, 0x5b0000},
 			{"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 CPE210 V2 */
+	{
 		.id     = "CPE210V2",
 		.vendor = "CPE210(TP-LINK|UN|N300-2|00000000):2.0\r\n",
 		.support_list =
 			"SupportList:\r\n"
 			"CPE210(TP-LINK|EU|N300-2|00000000):2.0\r\n"
 			"CPE210(TP-LINK|EU|N300-2|45550000):2.0\r\n"
 			"CPE210(TP-LINK|EU|N300-2|55530000):2.0\r\n"
 			"CPE210(TP-LINK|UN|N300-2|00000000):2.0\r\n"
 			"CPE210(TP-LINK|UN|N300-2|45550000):2.0\r\n"
 			"CPE210(TP-LINK|UN|N300-2|55530000):2.0\r\n"
 			"CPE210(TP-LINK|US|N300-2|55530000):2.0\r\n"
 			"CPE210(TP-LINK|UN|N300-2):2.0\r\n"
 			"CPE210(TP-LINK|EU|N300-2):2.0\r\n"
 			"CPE210(TP-LINK|US|N300-2):2.0\r\n",
 		.support_trail = '\xff',
 		.soft_ver = NULL,
 		.partitions = {
 			{"fs-uboot", 0x00000, 0x20000},
 			{"partition-table", 0x20000, 0x02000},
 			{"default-mac", 0x30000, 0x00020},
 			{"product-info", 0x31100, 0x00100},
 			{"device-info", 0x31400, 0x00400},
 			{"signature", 0x32000, 0x00400},
 			{"device-id", 0x33000, 0x00100},
 			{"os-image", 0x40000, 0x1c0000},
 			{"file-system", 0x200000, 0x5b0000},
 			{"soft-version", 0x7b0000, 0x00100},
 			{"support-list", 0x7b1000, 0x01000},
 			{"user-config", 0x7c0000, 0x10000},
 			{"default-config", 0x7d0000, 0x10000},
 			{"log", 0x7e0000, 0x10000},
 			{"radio", 0x7f0000, 0x10000},
 			{NULL, 0, 0}
 		},
 		.first_sysupgrade_partition = "os-image",
 		.last_sysupgrade_partition = "support-list",
 	},
 	/** Firmware layout for the CPE510/520 */
+	{
 		.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"
 			"CPE510(TP-LINK|UN|N300-5):1.1\r\n"
 			"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 = {
 			{"fs-uboot", 0x00000, 0x20000},
 			{"partition-table", 0x20000, 0x02000},
 			{"default-mac", 0x30000, 0x00020},
 			{"product-info", 0x31100, 0x00100},
 			{"signature", 0x32000, 0x00400},
 			{"os-image", 0x40000, 0x1c0000},
 			{"file-system", 0x200000, 0x5b0000},
 			{"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',
 		.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, 0x1c0000},
 			{"file-system", 0x200000, 0x5b0000},
 			{"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',
 		.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, 0x1c0000},
 			{"file-system", 0x200000, 0x5b0000},
 			{"soft-version", 0x7b0000, 0x00100},
 			{"support-list", 0x7b1000, 0x00400},
 			{"user-config", 0x7c0000, 0x10000},
 			{"default-config", 0x7d0000, 0x10000},
 			{"log", 0x7e0000, 0x10000},
 			{"radio", 0x7f0000, 0x10000},
 			{NULL, 0, 0}
 		},
 		.first_sysupgrade_partition = "os-image",
 		.last_sysupgrade_partition = "support-list",
 	},
 	/** Firmware layout for the C2600 */
+	{
 		.id = "C2600",
 		.vendor = "",
 		.support_list =
 			"SupportList:\r\n"
 			"{product_name:Archer C2600,product_ver:1.0.0,special_id:00000000}\r\n",
 		.support_trail = '\x00',
 		.soft_ver = NULL,
 		/**
 		    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 since kernel 4.14.
 		*/
 		.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}, /* Stock: base 0x1f0000 size 0x200000 */
 			{"file-system", 0x5f0000, 0x1900000}, /* Stock: base 0x3f0000 size 0x1b00000 */
 			{"default-mac", 0x1ef0000, 0x00200},
 			{"pin", 0x1ef0200, 0x00200},
 			{"product-info", 0x1ef0400, 0x0fc00},
 			{"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 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",
 		.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',
 		.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},
 			{"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 C58v1 */
+	{
 		.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',
 		.soft_ver = "soft_ver:1.0.0\n",
 		.partitions = {
 			{"fs-uboot", 0x00000, 0x10000},
 			{"default-mac", 0x10000, 0x00200},
 			{"pin", 0x10200, 0x00200},
 			{"product-info", 0x10400, 0x00100},
 			{"partition-table", 0x10500, 0x00800},
 			{"soft-version", 0x11300, 0x00200},
 			{"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}
 		},
 		.first_sysupgrade_partition = "os-image",
 		.last_sysupgrade_partition = "file-system",
 	},
 	/** Firmware layout for the C59v1 */
+	{
 		.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',
 		.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},
-			{"firmware", 0x20000, 0xe30000},
+			{"os-image", 0x20000, 0x180000},
+			{"file-system", 0x1a0000, 0xcb0000},
 			{"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},
 			{"qos-db", 0xf00000, 0x40000},
 			{"log", 0xfe0000, 0x10000},
 			{"radio", 0xff0000, 0x10000},
 			{NULL, 0, 0}
 		},
 		.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",
 		.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',
 		.soft_ver = "soft_ver:1.0.0\n",
 		.partitions = {
 			{"fs-uboot", 0x00000, 0x10000},
 			{"default-mac", 0x10000, 0x00200},
 			{"pin", 0x10200, 0x00200},
 			{"product-info", 0x10400, 0x00100},
 			{"partition-table", 0x10500, 0x00800},
 			{"soft-version", 0x11300, 0x00200},
 			{"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}
 		},
 		.first_sysupgrade_partition = "os-image",
 		.last_sysupgrade_partition = "file-system",
 	},
 	/** Firmware layout for the C60v2 */
+	{
 		.id	= "ARCHER-C60-V2",
 		.vendor	= "",
 		.support_list =
 			"SupportList:\r\n"
 			"{product_name:Archer C60,product_ver:2.0.0,special_id:42520000}\r\n"
 			"{product_name:Archer C60,product_ver:2.0.0,special_id:45550000}\r\n"
 			"{product_name:Archer C60,product_ver:2.0.0,special_id:55530000}\r\n",
 		.support_trail = '\x00',
 		.soft_ver = "soft_ver:2.0.0\n",
 		.partitions = {
 			{"factory-boot", 0x00000, 0x1fb00},
 			{"default-mac", 0x1fb00, 0x00200},
 			{"pin", 0x1fd00, 0x00100},
 			{"product-info", 0x1fe00, 0x00100},
 			{"device-id", 0x1ff00, 0x00100},
 			{"fs-uboot", 0x20000, 0x10000},
-			{"firmware", 0x30000, 0x7a0000},
+			{"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},
 			{"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",
 		.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',
 		.soft_ver = NULL,
 		.partitions = {
 			{"fs-uboot", 0x00000, 0x40000},
 			{"os-image", 0x40000, 0x200000},
 			{"file-system", 0x240000, 0xc00000},
 			{"default-mac", 0xe40000, 0x00200},
 			{"pin", 0xe40200, 0x00200},
 			{"product-info", 0xe40400, 0x00200},
 			{"partition-table", 0xe50000, 0x10000},
 			{"soft-version", 0xe60000, 0x00200},
 			{"support-list", 0xe61000, 0x0f000},
 			{"profile", 0xe70000, 0x10000},
 			{"default-config", 0xe80000, 0x10000},
 			{"user-config", 0xe90000, 0x50000},
 			{"log", 0xee0000, 0x100000},
 			{"radio_bk", 0xfe0000, 0x10000},
 			{"radio", 0xff0000, 0x10000},
 			{NULL, 0, 0}
 		},
 		.first_sysupgrade_partition = "os-image",
 		.last_sysupgrade_partition = "file-system"
 	},
 	/** Firmware layout for the C7 */
+	{
 		.id = "ARCHER-C7-V4",
 		.support_list =
 			"SupportList:\n"
 			"{product_name:Archer C7,product_ver:4.0.0,special_id:00000000}\n"
 			"{product_name:Archer C7,product_ver:4.0.0,special_id:41550000}\n"
 			"{product_name:Archer C7,product_ver:4.0.0,special_id:45550000}\n"
 			"{product_name:Archer C7,product_ver:4.0.0,special_id:4B520000}\n"
 			"{product_name:Archer C7,product_ver:4.0.0,special_id:42520000}\n"
 			"{product_name:Archer C7,product_ver:4.0.0,special_id:4A500000}\n"
 			"{product_name:Archer C7,product_ver:4.0.0,special_id:52550000}\n"
 			"{product_name:Archer C7,product_ver:4.0.0,special_id:54570000}\n"
 			"{product_name:Archer C7,product_ver:4.0.0,special_id:55530000}\n"
 			"{product_name:Archer C7,product_ver:4.0.0,special_id:43410000}\n",
 		.support_trail = '\x00',
 		.soft_ver = "soft_ver:1.0.0\n",
+		/**
+		    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},
 			{"soft-version", 0xf10000, 0x00100},
 			{"extra-para", 0xf11000, 0x01000},
 			{"support-list", 0xf12000, 0x0a000},
 			{"profile", 0xf1c000, 0x04000},
 			{"default-config", 0xf20000, 0x10000},
 			{"user-config", 0xf30000, 0x40000},
 			{"qos-db", 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 C7 v5*/
+	{
 		.id = "ARCHER-C7-V5",
 		.support_list =
 			"SupportList:\n"
 			"{product_name:Archer C7,product_ver:5.0.0,special_id:00000000}\n"
-			"{product_name:Archer C7,product_ver:5.0.0,special_id:45550000}\n"
-			"{product_name:Archer C7,product_ver:5.0.0,special_id:55530000}\n"
+			"{product_name:Archer C7,product_ver:5.0.0,special_id: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",
+		/**
+		  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},
 			{"partition-table", 0x40000,  0x10000},
 			{"radio",           0x50000,  0x10000},
 			{"default-mac",     0x60000,  0x00200},
 			{"pin",             0x60200,  0x00200},
 			{"device-id",       0x60400,  0x00100},
 			{"product-info",    0x60500,  0x0fb00},
 			{"soft-version",    0x70000,  0x01000},
 			{"extra-para",      0x71000,  0x01000},
 			{"support-list",    0x72000,  0x0a000},
 			{"profile",         0x7c000,  0x04000},
 			{"user-config",     0x80000,  0x40000},
-			{"firmware",        0xc0000,  0xf00000},	/* Stock: name os-image base 0xc0000  size 0x120000 */
+			{"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},
 			{"certificate",     0xfe0000, 0x10000},
 			{"default-config",  0xff0000, 0x10000},
 			{NULL, 0, 0}
 		},
 		.first_sysupgrade_partition = "os-image",
 		.last_sysupgrade_partition = "file-system",
 	},
 	/** Firmware layout for the C9 */
+	{
 		.id = "ARCHERC9",
 		.vendor = "",
 		.support_list =
 			"SupportList:\n"
 			"{product_name:ArcherC9,"
 			"product_ver:1.0.0,"
 			"special_id:00000000}\n",
 		.support_trail = '\x00',
 		.soft_ver = NULL,
 		.partitions = {
 			{"fs-uboot", 0x00000, 0x40000},
 			{"os-image", 0x40000, 0x200000},
 			{"file-system", 0x240000, 0xc00000},
 			{"default-mac", 0xe40000, 0x00200},
 			{"pin", 0xe40200, 0x00200},
 			{"product-info", 0xe40400, 0x00200},
 			{"partition-table", 0xe50000, 0x10000},
 			{"soft-version", 0xe60000, 0x00200},
 			{"support-list", 0xe61000, 0x0f000},
 			{"profile", 0xe70000, 0x10000},
 			{"default-config", 0xe80000, 0x10000},
 			{"user-config", 0xe90000, 0x50000},
 			{"log", 0xee0000, 0x100000},
 			{"radio_bk", 0xfe0000, 0x10000},
 			{"radio", 0xff0000, 0x10000},
 			{NULL, 0, 0}
 		},
 		.first_sysupgrade_partition = "os-image",
 		.last_sysupgrade_partition = "file-system"
 	},
 	/** Firmware layout for the EAP120 */
+	{
 		.id     = "EAP120",
 		.vendor = "EAP120(TP-LINK|UN|N300-2):1.0\r\n",
 		.support_list =
 			"SupportList:\r\n"
 			"EAP120(TP-LINK|UN|N300-2):1.0\r\n",
 		.support_trail = '\xff',
 		.soft_ver = NULL,
 		.partitions = {
 			{"fs-uboot", 0x00000, 0x20000},
 			{"partition-table", 0x20000, 0x02000},
 			{"default-mac", 0x30000, 0x00020},
 			{"support-list", 0x31000, 0x00100},
 			{"product-info", 0x31100, 0x00100},
 			{"soft-version", 0x32000, 0x00100},
 			{"os-image", 0x40000, 0x180000},
 			{"file-system", 0x1c0000, 0x600000},
 			{"user-config", 0x7c0000, 0x10000},
 			{"backup-config", 0x7d0000, 0x10000},
 			{"log", 0x7e0000, 0x10000},
 			{"radio", 0x7f0000, 0x10000},
 			{NULL, 0, 0}
 		},
 		.first_sysupgrade_partition = "os-image",
 		.last_sysupgrade_partition = "file-system"
 	},
 	/** Firmware layout for the TL-WA850RE v2 */
+	{
 		.id     = "TLWA850REV2",
 		.vendor = "",
 		.support_list =
 			"SupportList:\n"
 			"{product_name:TL-WA850RE,product_ver:2.0.0,special_id:55530000}\n"
 			"{product_name:TL-WA850RE,product_ver:2.0.0,special_id:00000000}\n"
 			"{product_name:TL-WA850RE,product_ver:2.0.0,special_id:55534100}\n"
 			"{product_name:TL-WA850RE,product_ver:2.0.0,special_id:45550000}\n"
 			"{product_name:TL-WA850RE,product_ver:2.0.0,special_id:4B520000}\n"
 			"{product_name:TL-WA850RE,product_ver:2.0.0,special_id:42520000}\n"
 			"{product_name:TL-WA850RE,product_ver:2.0.0,special_id:4A500000}\n"
 			"{product_name:TL-WA850RE,product_ver:2.0.0,special_id:43410000}\n"
 			"{product_name:TL-WA850RE,product_ver:2.0.0,special_id:41550000}\n"
 			"{product_name:TL-WA850RE,product_ver:2.0.0,special_id:52550000}\n",
 		.support_trail = '\x00',
 		.soft_ver = NULL,
 		/**
 KB were moved from file-system to os-image
 		   in comparison to the stock image
 		*/
 		.partitions = {
 			{"fs-uboot", 0x00000, 0x20000},
 			{"os-image", 0x20000, 0x150000},
 			{"file-system", 0x170000, 0x240000},
 			{"partition-table", 0x3b0000, 0x02000},
 			{"default-mac", 0x3c0000, 0x00020},
 			{"pin", 0x3c0100, 0x00020},
 			{"product-info", 0x3c1000, 0x01000},
 			{"soft-version", 0x3c2000, 0x00100},
 			{"support-list", 0x3c3000, 0x01000},
 			{"profile", 0x3c4000, 0x08000},
 			{"user-config", 0x3d0000, 0x10000},
 			{"default-config", 0x3e0000, 0x10000},
 			{"radio", 0x3f0000, 0x10000},
 			{NULL, 0, 0}
 		},
 		.first_sysupgrade_partition = "os-image",
 		.last_sysupgrade_partition = "file-system"
 	},
 	/** Firmware layout for the TL-WA855RE v1 */
+	{
 		.id     = "TLWA855REV1",
 		.vendor = "",
 		.support_list =
 			"SupportList:\n"
 			"{product_name:TL-WA855RE,product_ver:1.0.0,special_id:00000000}\n"
 			"{product_name:TL-WA855RE,product_ver:1.0.0,special_id:55530000}\n"
 			"{product_name:TL-WA855RE,product_ver:1.0.0,special_id:45550000}\n"
 			"{product_name:TL-WA855RE,product_ver:1.0.0,special_id:4B520000}\n"
 			"{product_name:TL-WA855RE,product_ver:1.0.0,special_id:42520000}\n"
 			"{product_name:TL-WA855RE,product_ver:1.0.0,special_id:4A500000}\n"
 			"{product_name:TL-WA855RE,product_ver:1.0.0,special_id:43410000}\n"
 			"{product_name:TL-WA855RE,product_ver:1.0.0,special_id:41550000}\n"
 			"{product_name:TL-WA855RE,product_ver:1.0.0,special_id:52550000}\n",
 		.support_trail = '\x00',
 		.soft_ver = NULL,
 		.partitions = {
 			{"fs-uboot", 0x00000, 0x20000},
 			{"os-image", 0x20000, 0x150000},
 			{"file-system", 0x170000, 0x240000},
 			{"partition-table", 0x3b0000, 0x02000},
 			{"default-mac", 0x3c0000, 0x00020},
 			{"pin", 0x3c0100, 0x00020},
 			{"product-info", 0x3c1000, 0x01000},
 			{"soft-version", 0x3c2000, 0x00100},
 			{"support-list", 0x3c3000, 0x01000},
 			{"profile", 0x3c4000, 0x08000},
 			{"user-config", 0x3d0000, 0x10000},
 			{"default-config", 0x3e0000, 0x10000},
 			{"radio", 0x3f0000, 0x10000},
 			{NULL, 0, 0}
 		},
 		.first_sysupgrade_partition = "os-image",
 		.last_sysupgrade_partition = "file-system"
 	},
 	/** Firmware layout for the TL-WR1043 v5 */
+	{
 		.id     = "TLWR1043NV5",
 		.vendor = "",
 		.support_list =
 			"SupportList:\n"
 			"{product_name:TL-WR1043N,product_ver:5.0.0,special_id:45550000}\n"
 			"{product_name:TL-WR1043N,product_ver:5.0.0,special_id:55530000}\n",
 		.support_trail = '\x00',
 		.soft_ver = "soft_ver:1.0.0\n",
 		.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},
 			{"extra-para", 0xf11000, 0x01000},
 			{"support-list", 0xf12000, 0x0a000},
 			{"profile", 0xf1c000, 0x04000},
 			{"default-config", 0xf20000, 0x10000},
 			{"user-config", 0xf30000, 0x40000},
 			{"qos-db", 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 TL-WR1043 v4 */
+	{
 		.id     = "TLWR1043NDV4",
 		.vendor = "",
 		.support_list =
 			"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},
 			{"support-list", 0xf6b000, 0x04000},
 			{"profile", 0xf70000, 0x04000},
 			{"default-config", 0xf74000, 0x0b000},
 			{"user-config", 0xf80000, 0x40000},
 			{"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 TL-WR902AC v1 */
+	{
 		.id     = "TL-WR902AC-V1",
 		.vendor = "",
 		.support_list =
 			"SupportList:\n"
 			"{product_name:TL-WR902AC,product_ver:1.0.0,special_id:45550000}\n"
 			"{product_name:TL-WR902AC,product_ver:1.0.0,special_id:55530000}\n",
 		.support_trail = '\x00',
 		.soft_ver = NULL,
 		/**
 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},
 			{"profile", 0x770000, 0x04000},
 			{"default-config", 0x774000, 0x0b000},
 			{"user-config", 0x780000, 0x40000},
 			{"partition-table", 0x7c0000, 0x10000},
 			{"log", 0x7d0000, 0x20000},
 			{"radio", 0x7f0000, 0x10000},
 			{NULL, 0, 0}
 		},
 		.first_sysupgrade_partition = "os-image",
 		.last_sysupgrade_partition = "file-system",
 	},
 	/** Firmware layout for the TL-WR942N V1 */
+	{
 		.id     = "TLWR942NV1",
 		.vendor = "",
 		.support_list =
 			"SupportList:\r\n"
 			"{product_name:TL-WR942N,product_ver:1.0.0,special_id:00000000}\r\n"
 			"{product_name:TL-WR942N,product_ver:1.0.0,special_id:52550000}\r\n",
 		.support_trail = '\x00',
 		.soft_ver = NULL,
 		.partitions = {
 			{"fs-uboot", 0x00000, 0x20000},
-			{"firmware", 0x20000, 0xe20000},
+			{"os-image", 0x20000, 0x180000},
+			{"file-system", 0x1a0000, 0xca0000},
 			{"default-mac", 0xe40000, 0x00200},
 			{"pin", 0xe40200, 0x00200},
 			{"product-info", 0xe40400, 0x0fc00},
 			{"partition-table", 0xe50000, 0x10000},
 			{"soft-version", 0xe60000, 0x10000},
 			{"support-list", 0xe70000, 0x10000},
 			{"profile", 0xe80000, 0x10000},
 			{"default-config", 0xe90000, 0x10000},
 			{"user-config", 0xea0000, 0x40000},
 			{"qos-db", 0xee0000, 0x40000},
 			{"certificate", 0xf20000, 0x10000},
 			{"usb-config", 0xfb0000, 0x10000},
 			{"log", 0xfc0000, 0x20000},
 			{"radio-bk", 0xfe0000, 0x10000},
 			{"radio", 0xff0000, 0x10000},
 			{NULL, 0, 0}
 		},
 		.first_sysupgrade_partition = "os-image",
 		.last_sysupgrade_partition = "file-system",
 	},
 	/** Firmware layout for the RE350 v1 */
+	{
 		.id = "RE350-V1",
 		.vendor = "",
 		.support_list =
 			"SupportList:\n"
 			"{product_name:RE350,product_ver:1.0.0,special_id:45550000}\n"
 			"{product_name:RE350,product_ver:1.0.0,special_id:00000000}\n"
 			"{product_name:RE350,product_ver:1.0.0,special_id:41550000}\n"
 			"{product_name:RE350,product_ver:1.0.0,special_id:55530000}\n"
 			"{product_name:RE350,product_ver:1.0.0,special_id:43410000}\n"
 			"{product_name:RE350,product_ver:1.0.0,special_id:4b520000}\n"
 			"{product_name:RE350,product_ver:1.0.0,special_id:4a500000}\n",
 		.support_trail = '\x00',
 		.soft_ver = NULL,
+		/**
+			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},
 			{"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 RE355 */
+	{
 		.id = "RE355",
 		.vendor = "",
 		.support_list =
 			"SupportList:\r\n"
 			"{product_name:RE355,product_ver:1.0.0,special_id:00000000}\r\n"
 			"{product_name:RE355,product_ver:1.0.0,special_id:55530000}\r\n"
 			"{product_name:RE355,product_ver:1.0.0,special_id:45550000}\r\n"
 			"{product_name:RE355,product_ver:1.0.0,special_id:4A500000}\r\n"
 			"{product_name:RE355,product_ver:1.0.0,special_id:43410000}\r\n"
 			"{product_name:RE355,product_ver:1.0.0,special_id:41550000}\r\n"
 			"{product_name:RE355,product_ver:1.0.0,special_id:4B520000}\r\n"
 			"{product_name:RE355,product_ver:1.0.0,special_id:55534100}\r\n",
 		.support_trail = '\x00',
 		.soft_ver = NULL,
+		/**
+		   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},
 			{"soft-version", 0x620000, 0x01000},
 			{"support-list", 0x621000, 0x01000},
 			{"profile", 0x622000, 0x08000},
 			{"user-config", 0x630000, 0x10000},
 			{"default-config", 0x640000, 0x10000},
 			{"radio", 0x7f0000, 0x10000},
 			{NULL, 0, 0}
 		},
 		.first_sysupgrade_partition = "os-image",
 		.last_sysupgrade_partition = "file-system"
 	},
 	/** Firmware layout for the RE450 */
+	{
 		.id = "RE450",
 		.vendor = "",
 		.support_list =
 			"SupportList:\r\n"
 			"{product_name:RE450,product_ver:1.0.0,special_id:00000000}\r\n"
 			"{product_name:RE450,product_ver:1.0.0,special_id:55530000}\r\n"
 			"{product_name:RE450,product_ver:1.0.0,special_id:45550000}\r\n"
 			"{product_name:RE450,product_ver:1.0.0,special_id:4A500000}\r\n"
 			"{product_name:RE450,product_ver:1.0.0,special_id:43410000}\r\n"
 			"{product_name:RE450,product_ver:1.0.0,special_id:41550000}\r\n"
 			"{product_name:RE450,product_ver:1.0.0,special_id:4B520000}\r\n"
 			"{product_name:RE450,product_ver:1.0.0,special_id:55534100}\r\n",
 		.support_trail = '\x00',
 		.soft_ver = NULL,
-		/** 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},
 			{NULL, 0, 0}
 		},
 		.first_sysupgrade_partition = "os-image",
 		.last_sysupgrade_partition = "file-system"
 	},
 	{}
 };
 #define error(_ret, _errno, _str, ...)				\
 	do {							\
 		fprintf(stderr, _str ": %s\n", ## __VA_ARGS__,	\
 			strerror(_errno));			\
 		if (_ret)					\
 			exit(_ret);				\
 	} while (0)
 /** Stores a uint32 as big endian */
 static inline void put32(uint8_t *buf, uint32_t val) {
 	buf[0] = val >> 24;
 	buf[1] = val >> 16;
 	buf[2] = val >> 8;
 	buf[3] = val;
+}
 /** 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)};
 	if (!entry.data)
 		error(1, errno, "malloc");
 	return entry;
+}
 /** Frees an image partition */
 static void free_image_partition(struct image_partition_entry entry) {
 	free(entry.data);
+}
 static time_t source_date_epoch = -1;
 static void set_source_date_epoch() {
 	char *env = getenv("SOURCE_DATE_EPOCH");
 	char *endptr = env;
 	errno = 0;
         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 */
 static struct image_partition_entry make_partition_table(const struct flash_partition_entry *p) {
 	struct image_partition_entry entry = alloc_image_partition("partition-table", 0x800);
 	char *s = (char *)entry.data, *end = (char *)(s+entry.size);
 	*(s++) = 0x00;
 	*(s++) = 0x04;
 	*(s++) = 0x00;
 	*(s++) = 0x00;
 	size_t i;
 	for (i = 0; p[i].name; i++) {
 		size_t len = end-s;
 		size_t w = snprintf(s, len, "partition %s base 0x%05x size 0x%05x\n", p[i].name, p[i].base, p[i].size);
 		if (w > len-1)
 			error(1, 0, "flash partition table overflow?");
 		s += w;
+	}
 	s++;
 	memset(s, 0xff, end-s);
 	return entry;
+}
 /** Generates a binary-coded decimal representation of an integer in the range [0, 99] */
 static inline uint8_t bcd(uint8_t v) {
 	return 0x10 * (v/10) + v%10;
+}
 /** 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;
 	time_t t;
 	if (source_date_epoch != -1)
 		t = source_date_epoch;
 	else if (time(&t) == (time_t)(-1))
 		error(1, errno, "time");
 	struct tm *tm = localtime(&t);
 	s->magic = htonl(0x0000000c);
 	s->zero = 0;
 	s->pad1 = 0xff;
 	s->version_major = 0;
 	s->version_minor = 0;
 	s->version_patch = 0;
 	s->year_hi = bcd((1900+tm->tm_year)/100);
 	s->year_lo = bcd(tm->tm_year%100);
 	s->month = bcd(tm->tm_mon+1);
 	s->day = bcd(tm->tm_mday);
 	s->rev = htonl(rev);
 	s->pad2 = 0xff;
 	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);
 	entry.data[partition_len - 1] = 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);
 	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;
 	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;
 	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);
+		len = ALIGN(len, 0x10000) + sizeof(jffs2_eof_mark);
 	struct image_partition_entry entry = alloc_image_partition(part_name, len);
 	FILE *file = fopen(filename, "rb");
 	if (!file)
 		error(1, errno, "unable to open file `%s'", filename);
 	if (fread(entry.data, statbuf.st_size, 1, file) != 1)
 		error(1, errno, "unable to read file `%s'", filename);
 	if (add_jffs2_eof) {
 		uint8_t *eof = entry.data + statbuf.st_size, *end = entry.data+entry.size;
 		memset(eof, 0xff, end - eof - sizeof(jffs2_eof_mark));
 		memcpy(end - sizeof(jffs2_eof_mark), jffs2_eof_mark, sizeof(jffs2_eof_mark));
+	}
 	fclose(file);
 	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
    Example image partition table:
      fwup-ptn partition-table base 0x00800 size 0x00800
      fwup-ptn os-image base 0x01000 size 0x113b45
      fwup-ptn file-system base 0x114b45 size 0x1d0004
      fwup-ptn support-list base 0x2e4b49 size 0x000d1
    Each line of the partition table is terminated with the bytes 09 0d 0a ("\t\r\n"),
    the end of the partition table is marked with a zero byte.
    The firmware image must contain at least the partition-table and support-list partitions
    to be accepted. There aren't any alignment constraints for the image partitions.
    The partition-table partition contains the actual flash layout; partitions
    from the image partition table are mapped to the corresponding flash partitions during
    the firmware upgrade. The support-list partition contains a list of devices supported by
    the firmware image.
    The base offsets in the firmware partition table are relative to the end
    of the vendor information block, so the partition-table partition will
    actually start at offset 0x1814 of the image.
    I think partition-table must be the first partition in the firmware image.
 */
 static void put_partitions(uint8_t *buffer, const struct flash_partition_entry *flash_parts, const struct image_partition_entry *parts) {
 	size_t i, j;
 	char *image_pt = (char *)buffer, *end = image_pt + 0x800;
 	size_t base = 0x800;
 	for (i = 0; parts[i].name; i++) {
 		for (j = 0; flash_parts[j].name; j++) {
 			if (!strcmp(flash_parts[j].name, parts[i].name)) {
 				if (parts[i].size > flash_parts[j].size)
 					error(1, 0, "%s partition too big (more than %u bytes)", flash_parts[j].name, (unsigned)flash_parts[j].size);
 				break;
+			}
+		}
 		assert(flash_parts[j].name);
 		memcpy(buffer + base, parts[i].data, parts[i].size);
 		size_t len = end-image_pt;
 		size_t w = snprintf(image_pt, len, "fwup-ptn %s base 0x%05x size 0x%05x\t\r\n", parts[i].name, (unsigned)base, (unsigned)parts[i].size);
 		if (w > len-1)
 			error(1, 0, "image partition table overflow?");
 		image_pt += w;
 		base += parts[i].size;
+	}
+}
 /** Generates and writes the image MD5 checksum */
 static void put_md5(uint8_t *md5, uint8_t *buffer, unsigned int len) {
 	MD5_CTX ctx;
 	MD5_Init(&ctx);
 	MD5_Update(&ctx, md5_salt, (unsigned int)sizeof(md5_salt));
 	MD5_Update(&ctx, buffer, len);
 	MD5_Final(md5, &ctx);
+}
 /**
    Generates the firmware image in factory format
    Image format:
      Bytes (hex)  Usage
      -----------  -----
 -0003    Image size (4 bytes, big endian)
 -0013    MD5 hash (hash of a 16 byte salt and the image data starting with byte 0x14)
 -0017    Vendor information length (without padding) (4 bytes, big endian)
 -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++)
 		*len += parts[i].size;
 	uint8_t *image = malloc(*len);
 	if (!image)
 		error(1, errno, "malloc");
 	memset(image, 0xff, *len);
 	put32(image, *len);
 	if (info->vendor) {
 		size_t vendor_len = strlen(info->vendor);
 		put32(image+0x14, vendor_len);
 		memcpy(image+0x18, info->vendor, vendor_len);
+	}
 	put_partitions(image + 0x1014, info->partitions, parts);
 	put_md5(image+0x04, image+0x14, *len-0x14);
 	return image;
+}
 /**
    Generates the firmware image in sysupgrade format
    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 struct flash_partition_entry *flash_last_partition = NULL;
 	const struct image_partition_entry *image_last_partition = NULL;
 	/** Find first and last partitions */
 	for (i = 0; info->partitions[i].name; i++) {
 		if (!strcmp(info->partitions[i].name, info->first_sysupgrade_partition)) {
 			flash_first_partition = &info->partitions[i];
 			flash_first_partition_index = i;
 		} else if (!strcmp(info->partitions[i].name, info->last_sysupgrade_partition)) {
 			flash_last_partition = &info->partitions[i];
 			flash_last_partition_index = i;
+		}
+	}
 	assert(flash_first_partition && flash_last_partition);
 	assert(flash_first_partition_index < flash_last_partition_index);
 	/** Find last partition from image to calculate needed size */
 	for (i = 0; image_parts[i].name; i++) {
 		if (!strcmp(image_parts[i].name, info->last_sysupgrade_partition)) {
 			image_last_partition = &image_parts[i];
 			break;
+		}
+	}
 	assert(image_last_partition);
 	*len = flash_last_partition->base - flash_first_partition->base + image_last_partition->size;
 	uint8_t *image = malloc(*len);
 	if (!image)
 		error(1, errno, "malloc");
 	memset(image, 0xff, *len);
 	for (i = flash_first_partition_index; i <= flash_last_partition_index; i++) {
 		for (j = 0; image_parts[j].name; j++) {
 			if (!strcmp(info->partitions[i].name, image_parts[j].name)) {
 				if (image_parts[j].size > info->partitions[i].size)
 					error(1, 0, "%s partition too big (more than %u bytes)", info->partitions[i].name, (unsigned)info->partitions[i].size);
 				memcpy(image + info->partitions[i].base - flash_first_partition->base, image_parts[j].data, image_parts[j].size);
 				break;
+			}
 			assert(image_parts[j].name);
+		}
+	}
 	return image;
+}
 /** Generates an image according to a given layout and writes it to a file */
 static void build_image(const char *output,
 		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;
-	}
 	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);
+	parts[4] = read_file("file-system", rootfs_image, add_jffs2_eof);
 	/* Some devices need the extra-para partition to accept the firmware */
-	if (strcasecmp(info->id, "ARCHER-C2-V3") == 0 ||
-	    strcasecmp(info->id, "ARCHER-C25-V1") == 0 ||
-	    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) {
+	} else if (strcasecmp(info->id, "ARCHER-C7-V4") == 0 || strcasecmp(info->id, "ARCHER-C7-V5") == 0) {
 		const char mdat[11] = {0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0xca, 0x00, 0x01, 0x00, 0x00};
 		parts[5] = put_data("extra-para", mdat, 11);
-	} else if (strcasecmp(info->id, "ARCHER-C6-V2") == 0) {
-		const char mdat[11] = {0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00};
-		parts[5] = put_data("extra-para", mdat, 11);
+	}
 	size_t len;
 	void *image;
 	if (sysupgrade)
 		image = generate_sysupgrade_image(info, parts, &len);
 	else
 		image = generate_factory_image(info, parts, &len);
 	FILE *file = fopen(output, "wb");
 	if (!file)
 		error(1, errno, "unable to open output file");
 	if (fwrite(image, len, 1, file) != 1)
 		error(1, 0, "unable to write output file");
 	fclose(file);
 	free(image);
 	size_t i;
 	for (i = 0; parts[i].name; i++)
 		free_image_partition(parts[i]);
+}
 /** Usage output */
 static void usage(const char *argv0) {
 	fprintf(stderr,
 		"Usage: %s [OPTIONS...]\n"
 		"\n"
 		"Options:\n"
 		"  -h              show this help\n"
 		"\n"
 		"Create a new image:\n"
 		"  -B <board>      create image for the board specified with <board>\n"
 		"  -k <file>       read kernel image from the file <file>\n"
 		"  -r <file>       read rootfs image from the file <file>\n"
 		"  -o <file>       write output to the file <file>\n"
 		"  -V <rev>        sets the revision number to <rev>\n"
 		"  -j              add jffs2 end-of-filesystem markers\n"
 		"  -S              create sysupgrade instead of factory image\n"
 		"Extract an old image:\n"
 		"  -x <file>       extract all oem firmware partition\n"
 		"  -d <dir>        destination to extract the firmware partition\n"
 		"  -z <file>       convert an oem firmware into a sysupgade file. Use -o for output file\n",
 		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;
 	for (board = boards; board->id != NULL; board++)
 		if (strcasecmp(id, board->id) == 0)
 			return board;
 	return NULL;
+}
 static int add_flash_partition(
 		struct flash_partition_entry *part_list,
 		size_t max_entries,
 		const char *name,
 		unsigned long base,
 		unsigned long size)
+{
 	int ptr;
 	/* check if the list has a free entry */
 	for (ptr = 0; ptr < max_entries; ptr++, part_list++) {
 		if (part_list->name == NULL &&
 				part_list->base == 0 &&
 				part_list->size == 0)
 			break;
+	}
 	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");
-	}
 	memcpy((char *)part_list->name, name, strlen(name));
 	part_list->base = base;
 	part_list->size = size;
 	return 0;
+}
 /** read the partition table into struct flash_partition_entry */
 static int read_partition_table(
 		FILE *file, long offset,
 		struct flash_partition_entry *entries, size_t max_entries,
 		int type)
+{
 	char buf[2048];
 	char *ptr, *end;
 	const char *parthdr = NULL;
 	const char *fwuphdr = "fwup-ptn";
 	const char *flashhdr = "partition";
 	/* TODO: search for the partition table */
 	switch(type) {
 		case 0:
 			parthdr = fwuphdr;
 			break;
 		case 1:
 			parthdr = flashhdr;
 			break;
 		default:
 			error(1, 0, "Invalid partition table");
+	}
 	if (fseek(file, offset, SEEK_SET) < 0)
 		error(1, errno, "Can not seek in the firmware");
 	if (fread(buf, 1, 2048, file) < 0)
 		error(1, errno, "Can not read fwup-ptn from the firmware");
 	buf[2047] = '\0';
 	/* look for the partition header */
 	if (memcmp(buf, parthdr, strlen(parthdr)) != 0) {
 		fprintf(stderr, "DEBUG: can not find fwuphdr\n");
 		return 1;
+	}
 	ptr = buf;
 	end = buf + sizeof(buf);
 	while ((ptr + strlen(parthdr)) < end &&
 			memcmp(ptr, parthdr, strlen(parthdr)) == 0) {
 		char *end_part;
 		char *end_element;
 		char name[32] = { 0 };
 		int name_len = 0;
 		unsigned long base = 0;
 		unsigned long size = 0;
 		end_part = memchr(ptr, '\n', (end - ptr));
 		if (end_part == NULL) {
 			/* in theory this should never happen, because a partition always ends with 0x09, 0x0D, 0x0A */
 			break;
+		}
 		for (int i = 0; i <= 4; i++) {
 			if (end_part <= ptr)
 				break;
 			end_element = memchr(ptr, 0x20, (end_part - ptr));
 			if (end_element == NULL) {
 				error(1, errno, "Ignoring the rest of the partition entries.");
 				break;
+			}
 			switch (i) {
 				/* partition header */
 				case 0:
 					ptr = end_element + 1;
 					continue;
 				/* name */
 				case 1:
 					name_len = (end_element - ptr) > 31 ? 31 : (end_element - ptr);
 					strncpy(name, ptr, name_len);
 					name[name_len] = '\0';
 					ptr = end_element + 1;
 					continue;
 				/* string "base" */
 				case 2:
 					ptr = end_element + 1;
 					continue;
 				/* actual base */
 				case 3:
 					base = strtoul(ptr, NULL, 16);
 					ptr = end_element + 1;
 					continue;
 				/* string "size" */
 				case 4:
 					ptr = end_element + 1;
 					/* actual size. The last element doesn't have a sepeartor */
 					size = strtoul(ptr, NULL, 16);
 					/* the part ends with 0x09, 0x0d, 0x0a */
 					ptr = end_part + 1;
 					add_flash_partition(entries, max_entries, name, base, size);
 					continue;
+			}
+		}
+	}
 	return 0;
+}
 static void write_partition(
 		FILE *input_file,
 		size_t firmware_offset,
 		struct flash_partition_entry *entry,
 		FILE *output_file)
+{
 	char buf[4096];
 	size_t offset;
 	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)
 			error(1, errno, "Can not read partition from input_file");
 		if (fwrite(buf, sizeof(buf), 1, output_file) < 0)
 			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)
 			error(1, errno, "Can not read partition from input_file");
 		if (fwrite(buf, offset, 1, output_file) < 0)
 			error(1, errno, "Can not write partition to output_file");
+	}
+}
 static int extract_firmware_partition(FILE *input_file, size_t firmware_offset, struct flash_partition_entry *entry, const char *output_directory)
+{
 	FILE *output_file;
 	char output[PATH_MAX];
 	snprintf(output, PATH_MAX, "%s/%s", output_directory, entry->name);
 	output_file = fopen(output, "wb+");
 	if (output_file == NULL) {
 		error(1, errno, "Can not open output file %s", output);
+	}
 	write_partition(input_file, firmware_offset, entry, output_file);
 	fclose(output_file);
 	return 0;
+}
 /** extract all partitions from the firmware file */
 static int extract_firmware(const char *input, const char *output_directory)
+{
 	struct flash_partition_entry entries[16] = { 0 };
 	size_t max_entries = 16;
 	size_t firmware_offset = 0x1014;
 	FILE *input_file;
 	struct stat statbuf;
 	/* check input file */
 	if (stat(input, &statbuf)) {
 		error(1, errno, "Can not read input firmware %s", input);
+	}
 	/* check if output directory exists */
 	if (stat(output_directory, &statbuf)) {
 		error(1, errno, "Failed to stat output directory %s", output_directory);
+	}
 	if ((statbuf.st_mode & S_IFMT) != S_IFDIR) {
 		error(1, errno, "Given output directory is not a directory %s", output_directory);
+	}
 	input_file = fopen(input, "rb");
 	if (read_partition_table(input_file, firmware_offset, entries, 16, 0) != 0) {
 		error(1, 0, "Error can not read the partition table (fwup-ptn)");
+	}
 	for (int i = 0; i < max_entries; i++) {
 		if (entries[i].name == NULL &&
 				entries[i].base == 0 &&
 				entries[i].size == 0)
 			continue;
 		extract_firmware_partition(input_file, firmware_offset, &entries[i], output_directory);
+	}
 	return 0;
+}
 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++) {
 		if (strcmp(entries->name, name) == 0)
 			return entries;
+	}
 	error(1, 0, "%s", error_msg);
 	return NULL;
+}
 static void write_ff(FILE *output_file, size_t size)
+{
 	char buf[4096];
 	int 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)
 			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)
 			error(1, errno, "Can not write partition to output_file");
+	}
+}
 static void convert_firmware(const char *input, const char *output)
+{
 	struct flash_partition_entry fwup[MAX_PARTITIONS] = { 0 };
 	struct flash_partition_entry flash[MAX_PARTITIONS] = { 0 };
 	struct flash_partition_entry *fwup_os_image = NULL, *fwup_file_system = NULL;
 	struct flash_partition_entry *flash_os_image = NULL, *flash_file_system = NULL;
 	struct flash_partition_entry *fwup_partition_table = NULL;
 	size_t firmware_offset = 0x1014;
 	FILE *input_file, *output_file;
 	struct stat statbuf;
 	/* check input file */
 	if (stat(input, &statbuf)) {
 		error(1, errno, "Can not read input firmware %s", input);
+	}
 	input_file = fopen(input, "rb");
 	if (!input_file)
 		error(1, 0, "Can not open input firmware %s", input);
 	output_file = fopen(output, "wb");
 	if (!output_file)
 		error(1, 0, "Can not open output firmware %s", output);
 	if (read_partition_table(input_file, firmware_offset, fwup, MAX_PARTITIONS, 0) != 0) {
 		error(1, 0, "Error can not read the partition table (fwup-ptn)");
+	}
 	fwup_os_image = find_partition(fwup, MAX_PARTITIONS,
 			"os-image", "Error can not find os-image partition (fwup)");
 	fwup_file_system = find_partition(fwup, MAX_PARTITIONS,
 			"file-system", "Error can not find file-system partition (fwup)");
 	fwup_partition_table = find_partition(fwup, MAX_PARTITIONS,
 			"partition-table", "Error can not find partition-table partition");
 	/* the flash partition table has a 0x00000004 magic haeder */
 	if (read_partition_table(input_file, firmware_offset + fwup_partition_table->base + 4, flash, MAX_PARTITIONS, 1) != 0)
 		error(1, 0, "Error can not read the partition table (flash)");
 	flash_os_image = find_partition(flash, MAX_PARTITIONS,
 			"os-image", "Error can not find os-image partition (flash)");
 	flash_file_system = find_partition(flash, MAX_PARTITIONS,
 			"file-system", "Error can not find file-system partition (flash)");
 	/* write os_image to 0x0 */
 	write_partition(input_file, firmware_offset, fwup_os_image, output_file);
 	write_ff(output_file, flash_os_image->size - fwup_os_image->size);
 	/* write file-system behind os_image */
 	fseek(output_file, flash_file_system->base - flash_os_image->base, SEEK_SET);
 	write_partition(input_file, firmware_offset, fwup_file_system, output_file);
 	write_ff(output_file, flash_file_system->size - fwup_file_system->size);
 	fclose(output_file);
 	fclose(input_file);
+}
 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) {
 		int c;
 		c = getopt(argc, argv, "B:k:r:o:V:jSh:x:d:z:");
 		if (c == -1)
 			break;
 		switch (c) {
 		case 'B':
 			board = optarg;
 			break;
 		case 'k':
 			kernel_image = optarg;
 			break;
 		case 'r':
 			rootfs_image = optarg;
 			break;
 		case 'o':
 			output = optarg;
 			break;
 		case 'V':
 			sscanf(optarg, "r%u", &rev);
 			break;
 		case 'j':
 			add_jffs2_eof = true;
 			break;
 		case 'S':
 			sysupgrade = true;
 			break;
 		case 'h':
 			usage(argv[0]);
 			return 0;
 		case 'd':
 			output_directory = optarg;
 			break;
 		case 'x':
 			extract_image = optarg;
 			break;
 		case 'z':
 			convert_image = optarg;
 			break;
 		default:
 			usage(argv[0]);
 			return 1;
+		}
+	}
 	if (extract_image || output_directory) {
 		if (!extract_image)
 			error(1, 0, "No factory/oem image given via -x <file>. Output directory is only valid with -x");
 		if (!output_directory)
 			error(1, 0, "Can not extract an image without output directory. Use -d <dir>");
 		extract_firmware(extract_image, output_directory);
 	} else if (convert_image) {
 		if (!output)
 			error(1, 0, "Can not convert a factory/oem image into sysupgrade image without output file. Use -o <file>");
 		convert_firmware(convert_image, output);
 	} else {
 		if (!board)
 			error(1, 0, "no board has been specified");
 		if (!kernel_image)
 			error(1, 0, "no kernel image has been specified");
 		if (!rootfs_image)
 			error(1, 0, "no rootfs image has been specified");
 		if (!output)
 			error(1, 0, "no output filename has been specified");
 		info = find_board(board);
 		if (info == NULL)
 			error(1, 0, "unsupported board %s", board);
 		build_image(output, kernel_image, rootfs_image, rev, add_jffs2_eof, sysupgrade, info);
+	}
 	return 0;
+}