From: Mike Baker <mbm@openwrt.org>
Date: Tue, 10 Apr 2007 14:46:15 +0000 (+0000)
Subject: change handling of non-trx files
X-Git-Tag: reboot~29465
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=653cfd2ff9e331e1e796248e1f116711556b95c5;p=openwrt%2Fstaging%2Flynxis.git

change handling of non-trx files

SVN-Revision: 6924
---

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;
 	}