projects
/
openwrt
/
svn-archive
/
archive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6d6e4eb
)
change handling of non-trx files
author
Mike Baker
<mbm@openwrt.org>
Tue, 10 Apr 2007 14:46:15 +0000
(14:46 +0000)
committer
Mike Baker
<mbm@openwrt.org>
Tue, 10 Apr 2007 14:46:15 +0000
(14:46 +0000)
SVN-Revision: 6924
package/mtd/src/mtd.c
patch
|
blob
|
history
diff --git
a/package/mtd/src/mtd.c
b/package/mtd/src/mtd.c
index 0a968409a8bb4a62710f243ab75789ac412209a9..1d84816751d9b5c867c1815ee36c3e277c169703 100644
(file)
--- 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;
}
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");
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;
}
}
return 0;
}