From f4fc288059e85b275963a8fb3cb1dfe392305e90 Mon Sep 17 00:00:00 2001 From: markus Date: Thu, 25 Mar 2010 19:34:49 +0000 Subject: [PATCH] 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 --- target/linux/brcm-2.4/image/Makefile | 22 ++++++++++++++--- tools/firmware-utils/src/addpattern.c | 34 ++++++++++++++++++++------- tools/firmware-utils/src/trx.c | 30 ++++++++++++++++++----- 3 files changed, 69 insertions(+), 17 deletions(-) diff --git a/target/linux/brcm-2.4/image/Makefile b/target/linux/brcm-2.4/image/Makefile index 3dad1cee7..148c47f0c 100644 --- a/target/linux/brcm-2.4/image/Makefile +++ b/target/linux/brcm-2.4/image/Makefile @@ -32,7 +32,13 @@ ifneq ($(KERNEL),2.4) endif define Image/Build/CyberTAN - $(STAGING_DIR_HOST)/bin/addpattern -4 -p $(3) -v v$(4) -i $(BIN_DIR)/openwrt-$(BOARD)-$(1).trx -o $(BIN_DIR)/openwrt-$(2)-$(5).bin + $(STAGING_DIR_HOST)/bin/addpattern -4 -p $(3) -v v$(4) -i $(BIN_DIR)/openwrt-$(BOARD)-$(1).trx -o $(BIN_DIR)/openwrt-$(2)-$(5).bin $(if $(6),-s $(6)) +endef +define Image/Build/CyberTAN2 + $(STAGING_DIR_HOST)/bin/addpattern -4 -p $(3) -v v$(4) -i $(BIN_DIR)/openwrt-$(BOARD)-$(1).trx2 -o $(BIN_DIR)/openwrt-$(2)-$(5).bin $(if $(6),-s $(6)) +endef +define Image/Build/CyberTANHead + $(STAGING_DIR_HOST)/bin/addpattern -5 -p $(3) -v v$(4) -i /dev/null -o $(KDIR)/openwrt-$(2)-header.bin $(if $(6),-s $(6)) endef define Image/Build/Motorola @@ -50,13 +56,21 @@ define trxalign/jffs2-64k -a 0x10000 -f $(KDIR)/root.$(1) endef define trxalign/squashfs --a 1024 -f $(KDIR)/root.$(1) -a 0x10000 -A $(KDIR)/fs_mark +-a 1024 -f $(KDIR)/root.$(1) $(if $(2),-f $(2)) -a 0x10000 -A $(KDIR)/fs_mark endef +define Image/Build/trxV2 + $(call Image/Build/CyberTANHead,$(1),$(2),$(3),$(4),$(5),$(if $(6),$(6))) + $(STAGING_DIR_HOST)/bin/trx -2 -o $(BIN_DIR)/openwrt-$(BOARD)-$(1).trx2 \ + -f $(KDIR)/loader.gz -f $(KDIR)/vmlinux.lzma \ + $(call trxalign/$(1),$(1),$(KDIR)/openwrt-$(2)-header.bin) + $(call Image/Build/CyberTAN2,$(1),$(2),$(3),$(4),$(5),$(if $(6),$(6))) +endef define Image/Build/jffs2-128k $(call Image/Build/CyberTAN,$(1),wrt54gs,W54S,4.80.1,$(patsubst jffs2-%,jffs2,$(1))) $(call Image/Build/CyberTAN,$(1),wrtsl54gs,W54U,2.08.1,$(patsubst jffs2-%,jffs2,$(1))) + $(call Image/Build/trxV2,$(1),wrt54g3gv2-vf,3G2V,3.00.24,$(patsubst jffs2-%,jffs2,$(1)),6) ifeq ($(KERNEL),2.6) $(call Image/Build/wgt634u,$(1),$(patsubst jffs2-%,jffs2,$(1))) endif @@ -85,7 +99,9 @@ define Image/Build/Initramfs endef define Image/Build - $(STAGING_DIR_HOST)/bin/trx -o $(BIN_DIR)/openwrt-$(BOARD)-$(1).trx -f $(KDIR)/loader.gz -f $(KDIR)/vmlinux.lzma $(call trxalign/$(1),$(1)) + $(STAGING_DIR_HOST)/bin/trx -o $(BIN_DIR)/openwrt-$(BOARD)-$(1).trx \ + -f $(KDIR)/loader.gz -f $(KDIR)/vmlinux.lzma \ + $(call trxalign/$(1),$(1)) $(call Image/Build/$(1),$(1)) $(call Image/Build/Motorola,$(1),wr850g,1,$(1)) $(call Image/Build/USR,$(1),usr5461,$(1)) 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]; } diff --git a/tools/firmware-utils/src/trx.c b/tools/firmware-utils/src/trx.c index b9830239a..728deac37 100644 --- a/tools/firmware-utils/src/trx.c +++ b/tools/firmware-utils/src/trx.c @@ -35,6 +35,12 @@ * February 19, 2005 - mbm * * Add -a (align offset) and -b (absolute offset) + * + * March 24, 2010 - markus + * + * extend trx header struct for new version + * assume v1 for as default + * Add option -2 to allow v2 header */ #include @@ -59,7 +65,6 @@ uint32_t crc32buf(char *buf, size_t len); /* from trxhdr.h */ #define TRX_MAGIC 0x30524448 /* "HDR0" */ -#define TRX_VERSION 1 #define TRX_MAX_LEN 0x720000 #define TRX_NO_HEADER 1 /* Do not write TRX header */ @@ -68,7 +73,7 @@ struct trx_header { uint32_t len; /* Length of file including header */ uint32_t crc32; /* 32-bit CRC from flag_version to end of file */ uint32_t flag_version; /* 0:15 flags, 16:31 version */ - uint32_t offsets[3]; /* Offsets of partitions from start of header */ + uint32_t offsets[4]; /* Offsets of partitions from start of header */ }; /**********************************************************************/ @@ -77,7 +82,9 @@ void usage(void) __attribute__ (( __noreturn__ )); void usage(void) { - fprintf(stderr, "Usage: trx [-o outfile] [-m maxlen] [-a align] [-b offset] [-f file] [-f file [-f file]]\n"); + fprintf(stderr, "Usage:\n"); + fprintf(stderr, " trx [-2] [-o outfile] [-m maxlen] [-a align] [-b offset] \\\n"); + fprintf(stderr, " [-f file] [-f file [-f file [-f file (v2 only)]]]\n"); exit(EXIT_FAILURE); } @@ -93,6 +100,7 @@ int main(int argc, char **argv) uint32_t cur_len; unsigned long maxlen = TRX_MAX_LEN; struct trx_header *p; + char trx_version = 1; fprintf(stderr, "mjn3's trx replacement - v0.81.1\n"); @@ -104,14 +112,24 @@ int main(int argc, char **argv) p = (struct trx_header *) buf; p->magic = STORE32_LE(TRX_MAGIC); - cur_len = sizeof(struct trx_header); - p->flag_version = STORE32_LE((TRX_VERSION << 16)); + cur_len = sizeof(struct trx_header) - 4; /* assume v1 header */ + p->flag_version = STORE32_LE((trx_version << 16)); in = NULL; i = 0; - while ((c = getopt(argc, argv, "-:o:m:a:b:f:A:")) != -1) { + while ((c = getopt(argc, argv, "-:2o:m:a:b:f:A:")) != -1) { switch (c) { + case '2': + /* take care that nothing was written to buf so far */ + if (cur_len != sizeof(struct trx_header) - 4) { + fprintf(stderr, "-2 has to be used before any other argument!\n"); + } + else { + trx_version = 2; + cur_len += 4; + } + break; case 'A': append = 1; /* fall through */ -- 2.20.1