mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-10-01 11:04:10 +03:00
change handling of non-trx files
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6924 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
d67a66fc18
commit
70020451ee
@ -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 (trx->magic != TRX_MAGIC || trx->len < sizeof(struct trx_header)) {
|
||||||
if (quiet < 2) {
|
if (quiet < 2) {
|
||||||
fprintf(stderr, "Bad trx header\n");
|
fprintf(stderr, "Bad trx header\n");
|
||||||
fprintf(stderr, "If this is a firmware in bin format, like some of the\n"
|
fprintf(stderr, "This is not the correct file format; refusing to flash.\n"
|
||||||
"original firmware files are, you need to convert it to trx.\n");
|
"Please specify the correct file or use -f to force.\n");
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user