From f4fc288059e85b275963a8fb3cb1dfe392305e90 Mon Sep 17 00:00:00 2001 From: markus Date: Thu, 25 Mar 2010 19:34:49 +0000 Subject: added support for wrt54g3gv2-vf and new trx header format - hacked addpattern due to changes in header format - added "-5" to addpattern, some 0xFF are needed for trx2 header "-4" broke CRC checking in CFE - hacked trx.c due to new header format version - added target to create trx-V2 images the flashmap driver possibly needs to be customized. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20433 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- tools/firmware-utils/src/addpattern.c | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) (limited to 'tools/firmware-utils/src/addpattern.c') diff --git a/tools/firmware-utils/src/addpattern.c b/tools/firmware-utils/src/addpattern.c index dbd07e684..6eccb1bd9 100644 --- a/tools/firmware-utils/src/addpattern.c +++ b/tools/firmware-utils/src/addpattern.c @@ -74,6 +74,9 @@ #define SUPPORT_4712_CHIP 0x0001 #define SUPPORT_INTEL_FLASH 0x0002 #define SUPPORT_5325E_SWITCH 0x0004 +/* (from 3.00.24 firmware cyutils.h) */ +#define SUPPORT_4704_CHIP 0x0008 +#define SUPPORT_5352E_CHIP 0x0010 struct code_header { /* from cyutils.h */ char magic[4]; @@ -82,16 +85,21 @@ struct code_header { /* from cyutils.h */ char fwvern[3]; char id[4]; /* U2ND */ char hw_ver; /* 0: for 4702, 1: for 4712 -- new in 2.04.3 */ - char unused; - unsigned char flags[2]; /* SUPPORT_ flags new for 3.37.2 (WRT54G v2.2 and WRT54GS v1.1) */ - unsigned char res2[10]; + + unsigned char sn; // Serial Number + unsigned char flags[2]; /* SUPPORT_ flags new for 3.37.2 (WRT54G v2.2 and WRT54GS v1.1) */ + unsigned char stable[2]; // The image is stable (for dual image) + unsigned char try1[2]; // Try to boot image first time (for dual image) + unsigned char try2[2]; // Try to boot image second time (for dual image) + unsigned char try3[2]; // Try to boot image third time (for dual_image) + unsigned char res3[2]; } ; struct board_info { char *id; char *pattern; char hw_ver; - char unused; + char sn; char flags[2]; }; @@ -100,7 +108,7 @@ struct board_info boards[] = { .id = "WRT160NL", .pattern = "NL16", .hw_ver = 0x00, - .unused = 0x0f, + .sn = 0x0f, .flags = {0x3f, 0x00}, }, { /* Terminating entry */ @@ -114,7 +122,7 @@ void usage(void) __attribute__ (( __noreturn__ )); void usage(void) { - fprintf(stderr, "Usage: addpattern [-i trxfile] [-o binfile] [-B board_id] [-p pattern] [-g] [-b] [-v v#.#.#] [-r #.#] [-{0|1|2|4}] -h\n"); + fprintf(stderr, "Usage: addpattern [-i trxfile] [-o binfile] [-B board_id] [-p pattern] [-s serial] [-g] [-b] [-v v#.#.#] [-r #.#] [-{0|1|2|4|5}] -h\n"); exit(EXIT_FAILURE); } @@ -155,7 +163,7 @@ int main(int argc, char **argv) hdr = (struct code_header *) buf; memset(hdr, 0, sizeof(struct code_header)); - while ((c = getopt(argc, argv, "i:o:p:gbv:0124hr:B:")) != -1) { + while ((c = getopt(argc, argv, "i:o:p:s:gbv:01245hr:B:")) != -1) { switch (c) { case 'i': ifn = optarg; @@ -166,6 +174,9 @@ int main(int argc, char **argv) case 'p': pattern = optarg; break; + case 's': + hdr->sn = (unsigned char) atoi (optarg); + break; case 'g': gflag = 1; break; @@ -192,6 +203,13 @@ int main(int argc, char **argv) hdr->hw_ver = 0; hdr->flags[0] = 0x1f; break; + case '5': + /* V5 is appended to trxV2 image */ + hdr->stable[0] = hdr->stable[1] = 0xFF; + hdr->try1[0] = hdr->try1[1] = 0xFF; + hdr->try2[0] = hdr->try2[1] = 0xFF; + hdr->try3[0] = hdr->try3[1] = 0xFF; + break; case 'r': hdr->hw_ver = (char)(atof(optarg)*10)+0x30; break; @@ -218,7 +236,7 @@ int main(int argc, char **argv) } pattern = board->pattern; hdr->hw_ver = board->hw_ver; - hdr->unused = board->unused; + hdr->sn = board->sn; hdr->flags[0] = board->flags[0]; hdr->flags[1] = board->flags[1]; } -- cgit v1.2.3