diff options
| author | Matteo Croce <rootkit85@yahoo.it> | 2008-03-11 00:45:22 +0000 |
|---|---|---|
| committer | Matteo Croce <rootkit85@yahoo.it> | 2008-03-11 00:45:22 +0000 |
| commit | 001f82bf2cc51d3a3cba212b2f38dd9fa961a5c7 (patch) | |
| tree | 39848c4e870161da986fdbf6f731f3e9f4b33775 | |
| parent | 0308392977206c9f3f4bed4443724ed579dc3165 (diff) | |
| download | upstream-001f82bf2cc51d3a3cba212b2f38dd9fa961a5c7.tar.gz upstream-001f82bf2cc51d3a3cba212b2f38dd9fa961a5c7.tar.bz2 upstream-001f82bf2cc51d3a3cba212b2f38dd9fa961a5c7.zip | |
Add AG241 code pattern (fixes #1089)
SVN-Revision: 10584
| -rw-r--r-- | target/linux/ar7/image/Makefile | 2 | ||||
| -rw-r--r-- | tools/firmware-utils/src/addpattern.c | 26 |
2 files changed, 25 insertions, 3 deletions
diff --git a/target/linux/ar7/image/Makefile b/target/linux/ar7/image/Makefile index 8952b09cec..d34547b688 100644 --- a/target/linux/ar7/image/Makefile +++ b/target/linux/ar7/image/Makefile @@ -78,6 +78,8 @@ define Image/Build $(call Image/Build/CyberTAN,$(1),WA21,WA21,$(1)) $(call Image/Build/CyberTAN,$(1),WA22,WA22,$(1)) $(call Image/Build/CyberTAN,$(1),WAG2,WAG2,$(1)) + $(call Image/Build/CyberTAN,$(1),AG241v2,AG3A -b -r 2.0,$(1)) + $(call Image/Build/CyberTAN,$(1),AG241v1,AG3A -b,$(1)) $(call Image/Build/CyberTAN,$(1),WA31,WA31 -b,$(1)) $(call Image/Build/CyberTAN,$(1),WA32,WA32 -b,$(1)) $(call Image/Build/CyberTAN,$(1),WA7A,WA7A -b,$(1)) diff --git a/tools/firmware-utils/src/addpattern.c b/tools/firmware-utils/src/addpattern.c index 5f49b921f6..6f2a036c0b 100644 --- a/tools/firmware-utils/src/addpattern.c +++ b/tools/firmware-utils/src/addpattern.c @@ -39,6 +39,22 @@ * and adds the new hardware "flags" for the v2.2/v1.1 units */ +/* January 1, 2007 + * + * Modified by juan.i.gonzalez at subdown dot net + * Support added for the AG241v2 and similar + * + * Extensions: + * -r #.# adds revision hardware flags. AG241v2 and similar. + * + * AG241V2 firmware sets the hw_ver to 0x44. + * + * Example: -r 2.0 + * + * Convert 2.0 to 20 to be an integer, and add 0x30 to skip special ASCII + * #define HW_Version ((HW_REV * 10) + 0x30) -> from cyutils.h +*/ + #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -77,7 +93,7 @@ void usage(void) __attribute__ (( __noreturn__ )); void usage(void) { - fprintf(stderr, "Usage: addpattern [-i trxfile] [-o binfile] [-p pattern] [-g] [-b] [-v v#.#.#] [-{0|1|2|4}]\n"); + fprintf(stderr, "Usage: addpattern [-i trxfile] [-o binfile] [-p pattern] [-g] [-b] [-v v#.#.#] [-r #.#] [-{0|1|2|4}] -h\n"); exit(EXIT_FAILURE); } @@ -105,7 +121,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:0124")) != -1) { + while ((c = getopt(argc, argv, "i:o:p:gbv:0124hr:")) != -1) { switch (c) { case 'i': ifn = optarg; @@ -142,13 +158,17 @@ int main(int argc, char **argv) hdr->hw_ver = 0; hdr->flags[0] = 0x1f; break; + case 'r': + hdr->hw_ver = (char)(atof(optarg)*10)+0x30; + break; + case 'h': default: usage(); } } - if (optind != argc) { + if (optind != argc || optind == 1) { fprintf(stderr, "illegal arg \"%s\"\n", argv[optind]); usage(); } |