diff options
| author | Mike Baker <mbm@openwrt.org> | 2007-04-10 14:46:15 +0000 |
|---|---|---|
| committer | Mike Baker <mbm@openwrt.org> | 2007-04-10 14:46:15 +0000 |
| commit | c642e847dc12487d4d8508fc74a9e3302fdfff30 (patch) | |
| tree | b73867e4289e5f67f224e3a96ebd670cf1cd4041 | |
| parent | 270fbcd87343892e1a429bae52152cadf142f928 (diff) | |
| download | master-187ad058-c642e847dc12487d4d8508fc74a9e3302fdfff30.tar.gz master-187ad058-c642e847dc12487d4d8508fc74a9e3302fdfff30.tar.bz2 master-187ad058-c642e847dc12487d4d8508fc74a9e3302fdfff30.zip | |
change handling of non-trx files
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6924 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/mtd/src/mtd.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/package/mtd/src/mtd.c b/package/mtd/src/mtd.c index 0a968409a8..1d84816751 100644 --- a/package/mtd/src/mtd.c +++ b/package/mtd/src/mtd.c @@ -84,22 +84,11 @@ image_check_brcm(int imagefd, const char *mtd) return 0; } - switch(trx->magic) { - case 0x47343557: /* W54G */ - case 0x53343557: /* W54S */ - case 0x73343557: /* W54s */ - case 0x46343557: /* W54F */ - case 0x55343557: /* W54U */ - /* ignore the first 32 bytes */ - buflen = read(imagefd, buf, sizeof(struct trx_header)); - break; - } - if (trx->magic != TRX_MAGIC || trx->len < sizeof(struct trx_header)) { if (quiet < 2) { fprintf(stderr, "Bad trx header\n"); - fprintf(stderr, "If this is a firmware in bin format, like some of the\n" - "original firmware files are, you need to convert it to trx.\n"); + fprintf(stderr, "This is not the correct file format; refusing to flash.\n" + "Please specify the correct file or use -f to force.\n"); } return 0; } |