X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=tools%2Ffirmware-utils%2Fsrc%2Fmktplinkfw.c;h=0f1e20f1422cbf660906c9c4b33fd2e4402a5166;hb=54c8d61b032fcd26a6a20a2a461673d357054d78;hp=73603bf1e91e1f291356d03f9b283821eb9229b0;hpb=0f659a13ddecb98e16241cf043a15d6045cab357;p=openwrt%2Fstaging%2Flynxis%2Fomap.git diff --git a/tools/firmware-utils/src/mktplinkfw.c b/tools/firmware-utils/src/mktplinkfw.c index 73603bf1e9..0f1e20f142 100644 --- a/tools/firmware-utils/src/mktplinkfw.c +++ b/tools/firmware-utils/src/mktplinkfw.c @@ -22,22 +22,24 @@ #include #include +#include +#include + #include "md5.h" -#if (__BYTE_ORDER == __BIG_ENDIAN) -# define HOST_TO_BE32(x) (x) -# define BE32_TO_HOST(x) (x) -#else -# define HOST_TO_BE32(x) bswap_32(x) -# define BE32_TO_HOST(x) bswap_32(x) -#endif +#define ALIGN(x,a) ({ typeof(a) __a = (a); (((x) + __a - 1) & ~(__a - 1)); }) #define HEADER_VERSION_V1 0x01000000 #define HWID_TL_MR3220_V1 0x32200001 #define HWID_TL_MR3420_V1 0x34200001 #define HWID_TL_WA901ND_V1 0x09010001 +#define HWID_TL_WA901ND_V2 0x09010002 +#define HWID_TL_WR703N_V1 0x07030101 #define HWID_TL_WR741ND_V1 0x07410001 +#define HWID_TL_WR741ND_V4 0x07410004 #define HWID_TL_WR740N_V1 0x07400001 +#define HWID_TL_WR740N_V3 0x07400003 +#define HWID_TL_WR743ND_V1 0x07430001 #define HWID_TL_WR841N_V1_5 0x08410002 #define HWID_TL_WR841ND_V3 0x08410003 #define HWID_TL_WR841ND_V5 0x08410005 @@ -99,8 +101,10 @@ static struct board_info *board; static struct file_info kernel_info; static uint32_t kernel_la = 0; static uint32_t kernel_ep = 0; +static uint32_t kernel_len = 0; static struct file_info rootfs_info; static uint32_t rootfs_ofs = 0; +static uint32_t rootfs_align; static struct file_info boot_info; static int combined; static int strip_padding; @@ -143,6 +147,14 @@ static struct board_info boards[] = { .kernel_la = 0x80060000, .kernel_ep = 0x80060000, .rootfs_ofs = 0x140000, + }, { + .id = "TL-WA901NDv2", + .hw_id = HWID_TL_WA901ND_V2, + .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, @@ -151,6 +163,14 @@ static struct board_info boards[] = { .kernel_la = 0x80060000, .kernel_ep = 0x80060000, .rootfs_ofs = 0x140000, + }, { + .id = "TL-WR741NDv4", + .hw_id = HWID_TL_WR741ND_V4, + .hw_rev = 1, + .fw_max_len = 0x3c0000, + .kernel_la = 0x80060000, + .kernel_ep = 0x80060000, + .rootfs_ofs = 0x100000, }, { .id = "TL-WR740Nv1", .hw_id = HWID_TL_WR740N_V1, @@ -159,6 +179,22 @@ static struct board_info boards[] = { .kernel_la = 0x80060000, .kernel_ep = 0x80060000, .rootfs_ofs = 0x140000, + }, { + .id = "TL-WR740Nv3", + .hw_id = HWID_TL_WR740N_V3, + .hw_rev = 1, + .fw_max_len = 0x3c0000, + .kernel_la = 0x80060000, + .kernel_ep = 0x80060000, + .rootfs_ofs = 0x140000, + }, { + .id = "TL-WR743NDv1", + .hw_id = HWID_TL_WR743ND_V1, + .hw_rev = 1, + .fw_max_len = 0x3c0000, + .kernel_la = 0x80060000, + .kernel_ep = 0x80060000, + .rootfs_ofs = 0x140000, }, { .id = "TL-WR841Nv1.5", .hw_id = HWID_TL_WR841N_V1_5, @@ -215,6 +251,14 @@ static struct board_info boards[] = { .kernel_la = 0x80060000, .kernel_ep = 0x80060000, .rootfs_ofs = 0x140000, + }, { + .id = "TL-WR703Nv1", + .hw_id = HWID_TL_WR703N_V1, + .hw_rev = 1, + .fw_max_len = 0x3c0000, + .kernel_la = 0x80060000, + .kernel_ep = 0x80060000, + .rootfs_ofs = 0x100000, }, { /* terminating entry */ } @@ -284,6 +328,7 @@ static void usage(int status) " -L overwrite kernel load address with (hexval prefixed with 0x)\n" " -k read kernel image from the file \n" " -r read rootfs image from the file \n" +" -a align the rootfs start on an bytes boundary\n" " -R overwrite rootfs offset with (hexval prefixed with 0x)\n" " -o write output to the file \n" " -s strip padding from the end of the image\n" @@ -391,6 +436,8 @@ static int check_options(void) if (ret) return ret; + kernel_len = kernel_info.file_size; + if (combined) { if (kernel_info.file_size > board->fw_max_len - sizeof(struct fw_header)) { @@ -398,11 +445,6 @@ static int check_options(void) return -1; } } else { - if (kernel_info.file_size > - rootfs_ofs - sizeof(struct fw_header)) { - ERR("kernel image is too big"); - return -1; - } if (rootfs_info.file_name == NULL) { ERR("no rootfs image specified"); return -1; @@ -412,10 +454,30 @@ static int check_options(void) if (ret) return ret; - if (rootfs_info.file_size > - (board->fw_max_len - rootfs_ofs)) { - ERR("rootfs image is too big"); - return -1; + if (rootfs_align) { + kernel_len += sizeof(struct fw_header); + kernel_len = ALIGN(kernel_len, rootfs_align); + kernel_len -= sizeof(struct fw_header); + + DBG("kernel length aligned to %u", kernel_len); + + if (kernel_len + rootfs_info.file_size > + board->fw_max_len - sizeof(struct fw_header)) { + ERR("images are too big"); + return -1; + } + } else { + if (kernel_info.file_size > + rootfs_ofs - sizeof(struct fw_header)) { + ERR("kernel image is too big"); + return -1; + } + + if (rootfs_info.file_size > + (board->fw_max_len - rootfs_ofs)) { + ERR("rootfs image is too big"); + return -1; + } } } @@ -433,25 +495,25 @@ static void fill_header(char *buf, int len) memset(hdr, 0, sizeof(struct fw_header)); - hdr->version = HOST_TO_BE32(HEADER_VERSION_V1); + hdr->version = htonl(HEADER_VERSION_V1); strncpy(hdr->vendor_name, vendor, sizeof(hdr->vendor_name)); strncpy(hdr->fw_version, version, sizeof(hdr->fw_version)); - hdr->hw_id = HOST_TO_BE32(board->hw_id); - hdr->hw_rev = HOST_TO_BE32(board->hw_rev); + hdr->hw_id = htonl(board->hw_id); + hdr->hw_rev = htonl(board->hw_rev); if (boot_info.file_size == 0) memcpy(hdr->md5sum1, md5salt_normal, sizeof(hdr->md5sum1)); else memcpy(hdr->md5sum1, md5salt_boot, sizeof(hdr->md5sum1)); - hdr->kernel_la = HOST_TO_BE32(kernel_la); - hdr->kernel_ep = HOST_TO_BE32(kernel_ep); - hdr->fw_length = HOST_TO_BE32(board->fw_max_len); - hdr->kernel_ofs = HOST_TO_BE32(sizeof(struct fw_header)); - hdr->kernel_len = HOST_TO_BE32(kernel_info.file_size); + hdr->kernel_la = htonl(kernel_la); + hdr->kernel_ep = htonl(kernel_ep); + hdr->fw_length = htonl(board->fw_max_len); + hdr->kernel_ofs = htonl(sizeof(struct fw_header)); + hdr->kernel_len = htonl(kernel_len); if (!combined) { - hdr->rootfs_ofs = HOST_TO_BE32(rootfs_ofs); - hdr->rootfs_len = HOST_TO_BE32(rootfs_info.file_size); + hdr->rootfs_ofs = htonl(rootfs_ofs); + hdr->rootfs_len = htonl(rootfs_info.file_size); } get_md5(buf, len, hdr->md5sum1); @@ -511,15 +573,21 @@ static int build_fw(void) if (ret) goto out_free_buf; - writelen = kernel_info.file_size; + writelen = sizeof(struct fw_header) + kernel_len; if (!combined) { - p = buf + rootfs_ofs; + if (rootfs_align) + p = buf + writelen; + else + p = buf + rootfs_ofs; ret = read_to_buf(&rootfs_info, p); if (ret) goto out_free_buf; - writelen = rootfs_ofs + rootfs_info.file_size; + if (rootfs_align) + writelen += rootfs_info.file_size; + else + writelen = rootfs_ofs + rootfs_info.file_size; } if (!strip_padding) @@ -625,18 +693,18 @@ static int inspect_fw(void) inspect_fw_pstr("File name", inspect_info.file_name); inspect_fw_phexdec("File size", inspect_info.file_size); - if (BE32_TO_HOST(hdr->version) != HEADER_VERSION_V1) { + if (ntohl(hdr->version) != HEADER_VERSION_V1) { ERR("file does not seem to have V1 header!\n"); goto out_free_buf; } inspect_fw_phexdec("Version 1 Header size", sizeof(struct fw_header)); - if (BE32_TO_HOST(hdr->unk1) != 0) + if (ntohl(hdr->unk1) != 0) inspect_fw_phexdec("Unknown value 1", hdr->unk1); memcpy(md5sum, hdr->md5sum1, sizeof(md5sum)); - if (BE32_TO_HOST(hdr->boot_len) == 0) + if (ntohl(hdr->boot_len) == 0) memcpy(hdr->md5sum1, md5salt_normal, sizeof(md5sum)); else memcpy(hdr->md5sum1, md5salt_boot, sizeof(md5sum)); @@ -648,62 +716,62 @@ static int inspect_fw(void) } else { inspect_fw_pmd5sum("Header MD5Sum1", md5sum, "(ok)"); } - if (BE32_TO_HOST(hdr->unk2) != 0) + if (ntohl(hdr->unk2) != 0) inspect_fw_phexdec("Unknown value 2", hdr->unk2); inspect_fw_pmd5sum("Header MD5Sum2", hdr->md5sum2, "(purpose yet unknown, unchecked here)"); - if (BE32_TO_HOST(hdr->unk3) != 0) + if (ntohl(hdr->unk3) != 0) inspect_fw_phexdec("Unknown value 3", hdr->unk3); printf("\n"); inspect_fw_pstr("Vendor name", hdr->vendor_name); inspect_fw_pstr("Firmware version", hdr->fw_version); - board = find_board_by_hwid(BE32_TO_HOST(hdr->hw_id)); + board = find_board_by_hwid(ntohl(hdr->hw_id)); if (board) { inspect_fw_phexpost("Hardware ID", - BE32_TO_HOST(hdr->hw_id), board->id); + ntohl(hdr->hw_id), board->id); inspect_fw_phexexp("Hardware Revision", - BE32_TO_HOST(hdr->hw_rev), board->hw_rev); + ntohl(hdr->hw_rev), board->hw_rev); } else { inspect_fw_phexpost("Hardware ID", - BE32_TO_HOST(hdr->hw_id), "unknown"); + ntohl(hdr->hw_id), "unknown"); inspect_fw_phex("Hardware Revision", - BE32_TO_HOST(hdr->hw_rev)); + ntohl(hdr->hw_rev)); } printf("\n"); inspect_fw_phexdec("Kernel data offset", - BE32_TO_HOST(hdr->kernel_ofs)); + ntohl(hdr->kernel_ofs)); inspect_fw_phexdec("Kernel data length", - BE32_TO_HOST(hdr->kernel_len)); + ntohl(hdr->kernel_len)); if (board) { inspect_fw_phexdef("Kernel load address", - BE32_TO_HOST(hdr->kernel_la), + ntohl(hdr->kernel_la), board->kernel_la); inspect_fw_phexdef("Kernel entry point", - BE32_TO_HOST(hdr->kernel_ep), + ntohl(hdr->kernel_ep), board->kernel_ep); inspect_fw_phexdecdef("Rootfs data offset", - BE32_TO_HOST(hdr->rootfs_ofs), + ntohl(hdr->rootfs_ofs), board->rootfs_ofs); } else { inspect_fw_phex("Kernel load address", - BE32_TO_HOST(hdr->kernel_la)); + ntohl(hdr->kernel_la)); inspect_fw_phex("Kernel entry point", - BE32_TO_HOST(hdr->kernel_ep)); + ntohl(hdr->kernel_ep)); inspect_fw_phexdec("Rootfs data offset", - BE32_TO_HOST(hdr->rootfs_ofs)); + ntohl(hdr->rootfs_ofs)); } inspect_fw_phexdec("Rootfs data length", - BE32_TO_HOST(hdr->rootfs_len)); + ntohl(hdr->rootfs_len)); inspect_fw_phexdec("Boot loader data offset", - BE32_TO_HOST(hdr->boot_ofs)); + ntohl(hdr->boot_ofs)); inspect_fw_phexdec("Boot loader data length", - BE32_TO_HOST(hdr->boot_len)); + ntohl(hdr->boot_len)); inspect_fw_phexdec("Total firmware length", - BE32_TO_HOST(hdr->fw_length)); + ntohl(hdr->fw_length)); if (extract) { FILE *fp; @@ -716,8 +784,8 @@ static int inspect_fw(void) printf("Extracting kernel to \"%s\"...\n", filename); fp = fopen(filename, "w"); if (fp) { - if (!fwrite(buf + BE32_TO_HOST(hdr->kernel_ofs), - BE32_TO_HOST(hdr->kernel_len), 1, fp)) { + if (!fwrite(buf + ntohl(hdr->kernel_ofs), + ntohl(hdr->kernel_len), 1, fp)) { ERR("error in fwrite(): %s", strerror(errno)); } fclose(fp); @@ -731,8 +799,8 @@ static int inspect_fw(void) printf("Extracting rootfs to \"%s\"...\n", filename); fp = fopen(filename, "w"); if (fp) { - if (!fwrite(buf + BE32_TO_HOST(hdr->rootfs_ofs), - BE32_TO_HOST(hdr->rootfs_len), 1, fp)) { + if (!fwrite(buf + ntohl(hdr->rootfs_ofs), + ntohl(hdr->rootfs_len), 1, fp)) { ERR("error in fwrite(): %s", strerror(errno)); } fclose(fp); @@ -760,11 +828,14 @@ int main(int argc, char *argv[]) while ( 1 ) { int c; - c = getopt(argc, argv, "B:E:L:V:N:ci:k:r:R:o:xhs"); + c = getopt(argc, argv, "a:B:E:L:V:N:ci:k:r:R:o:xhs"); if (c == -1) break; switch (c) { + case 'a': + sscanf(optarg, "0x%x", &rootfs_align); + break; case 'B': board_id = optarg; break;