X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/d2617d12b76493954a2cac3e7de802437271bfe4..b40bc2899b2e399c07e4b0b1dda0f9cfcb9c8b5a:/tools/firmware-utils/src/mktplinkfw.c

diff --git a/tools/firmware-utils/src/mktplinkfw.c b/tools/firmware-utils/src/mktplinkfw.c
index c39fd04a4..8e0f53e5e 100644
--- a/tools/firmware-utils/src/mktplinkfw.c
+++ b/tools/firmware-utils/src/mktplinkfw.c
@@ -33,6 +33,7 @@
 #endif
 
 #define HEADER_VERSION_V1	0x01000000
+#define HWID_TL_WA901ND_V1	0x09010001
 #define HWID_TL_WR741ND_V1	0x07410001
 #define HWID_TL_WR841N_V1_5	0x08410002
 #define HWID_TL_WR841ND_V3	0x08410003
@@ -95,6 +96,7 @@ static struct file_info kernel_info;
 static struct file_info rootfs_info;
 static struct file_info boot_info;
 static int combined;
+static int strip_padding;
 
 char md5salt_normal[MD5SUM_LEN] = {
 	0xdc, 0xd7, 0x3a, 0xa5, 0xc3, 0x95, 0x98, 0xfb,
@@ -108,6 +110,14 @@ char md5salt_boot[MD5SUM_LEN] = {
 
 static struct board_info boards[] = {
 	{
+		.id		= "TL-WA901NDv1",
+		.hw_id		= HWID_TL_WA901ND_V1,
+		.hw_rev		= 1,
+		.fw_max_len	= 0x3c0000,
+		.kernel_la	= 0x80060000,
+		.kernel_ep	= 0x80060000,
+		.rootfs_ofs	= 0x140000,
+	}, {
 		.id		= "TL-WR741NDv1",
 		.hw_id		= HWID_TL_WR741ND_V1,
 		.hw_rev		= 1,
@@ -218,7 +228,9 @@ static void usage(int status)
 "  -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 <version>    set image version to <version>\n"
+"  -s              strip padding from the end of the image\n"
+"  -N <vendor>     set image vendor to <vendor>\n"
+"  -V <version>    set image version to <version>\n"
 "  -h              show this screen\n"
 	);
 
@@ -406,6 +418,7 @@ static int build_fw(void)
 	char *buf;
 	char *p;
 	int ret = EXIT_FAILURE;
+	int writelen = 0;
 
 	buflen = board->fw_max_len;
 
@@ -421,16 +434,22 @@ static int build_fw(void)
 	if (ret)
 		goto out_free_buf;
 
+	writelen = kernel_info.file_size;
+
 	if (!combined) {
 		p = buf + board->rootfs_ofs;
 		ret = read_to_buf(&rootfs_info, p);
 		if (ret)
 			goto out_free_buf;
+
+		writelen = board->rootfs_ofs + rootfs_info.file_size;
 	}
 
-	fill_header(buf, buflen);
+	if (!strip_padding)
+		writelen = buflen;
 
-	ret = write_fw(buf, buflen);
+	fill_header(buf, writelen);
+	ret = write_fw(buf, writelen);
 	if (ret)
 		goto out_free_buf;
 
@@ -454,7 +473,7 @@ int main(int argc, char *argv[])
 	while ( 1 ) {
 		int c;
 
-		c = getopt(argc, argv, "B:V:N:ck:r:o:v:h:");
+		c = getopt(argc, argv, "B:V:N:ck:r:o:hs");
 		if (c == -1)
 			break;
 
@@ -480,8 +499,8 @@ int main(int argc, char *argv[])
 		case 'o':
 			ofname = optarg;
 			break;
-		case 'v':
-			version = optarg;
+		case 's':
+			strip_padding = 1;
 			break;
 		case 'h':
 			usage(EXIT_SUCCESS);