fix ifup hotplug event for static

[openwrt.git] / package / mtd / src / mtd.c

diff --git a/package/mtd/src/mtd.c b/package/mtd/src/mtd.c
index 23e9916..f5acb1e 100644 (file)
--- a/package/mtd/src/mtd.c
+++ b/package/mtd/src/mtd.c
@@ -62,14 +62,19 @@ struct trx_header {
 
 char buf[BUFSIZE];
 int buflen;
+int quiet;
 
+#ifdef target_brcm
 int
-image_check_bcom(int imagefd, const char *mtd)
+image_check_brcm(int imagefd, const char *mtd)
 {
        struct trx_header *trx = (struct trx_header *) buf;
        struct mtd_info_user mtdInfo;
        int fd;
 
+       if (strcmp(mtd, "linux") != 0)
+               return 1;
+       
        buflen = read(imagefd, buf, 32);
        if (buflen < 32) {
                fprintf(stdout, "Could not get image header, file too small (%ld bytes)\n", buflen);
@@ -88,10 +93,11 @@ image_check_bcom(int imagefd, const char *mtd)
        }
        
        if (trx->magic != TRX_MAGIC || trx->len < sizeof(struct trx_header)) {
-               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, use following command to convert to trx:\n"
-                               "dd if=firmware.bin of=firmware.trx bs=32 skip=1\n");
+               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");
+               }
                return 0;
        }
 
@@ -116,6 +122,7 @@ image_check_bcom(int imagefd, const char *mtd)
        close(fd);
        return 1;
 }
+#endif /* target_brcm */
 
 int
 image_check(int imagefd, const char *mtd)
@@ -125,23 +132,9 @@ image_check(int imagefd, const char *mtd)
        char *c;
        FILE *f;
 
-       systype = SYSTYPE_UNKNOWN;
-       f = fopen("/proc/cpuinfo", "r");
-       while (!feof(f) && (fgets(buf, BUFSIZE - 1, f) != NULL)) {
-               if ((strncmp(buf, "system type", 11) == 0) && (c = strchr(buf, ':'))) {
-                       c += 2;
-                       if (strncmp(c, "Broadcom BCM947XX", 17) == 0)
-                               systype = SYSTYPE_BROADCOM;
-               }
-       }
-       fclose(f);
-       
-       switch(systype) {
-               case SYSTYPE_BROADCOM:
-                       return image_check_bcom(imagefd, mtd);
-               default:
-                       return 1;
-       }
+#ifdef target_brcm
+       return image_check_brcm(imagefd, mtd);
+#endif
 }
 
 int mtd_check(char *mtd)
@@ -242,11 +235,8 @@ mtd_erase(const char *mtd)
                 mtdEraseInfo.start += mtdInfo.erasesize) {
                
                ioctl(fd, MEMUNLOCK, &mtdEraseInfo);
-               if(ioctl(fd, MEMERASE, &mtdEraseInfo)) {
-                       fprintf(stderr, "Could not erase MTD device: %s\n", mtd);
-                       close(fd);
-                       exit(1);
-               }
+               if(ioctl(fd, MEMERASE, &mtdEraseInfo))
+                       fprintf(stderr, "Failed to erase block on %s at 0x%x\n", mtd, mtdEraseInfo.start);
        }               
 
        close(fd);
@@ -255,7 +245,7 @@ mtd_erase(const char *mtd)
 }
 
 int
-mtd_write(int imagefd, const char *mtd, int quiet)
+mtd_write(int imagefd, const char *mtd)
 {
        int fd, i, result;
        size_t r, w, e;
@@ -346,7 +336,7 @@ void usage(void)
 
 int main (int argc, char **argv)
 {
-       int ch, i, boot, unlock, imagefd, force, quiet, unlocked;
+       int ch, i, boot, unlock, imagefd, force, unlocked;
        char *erase[MAX_ARGS], *device, *imagefile;
        enum {
                CMD_ERASE,
@@ -413,10 +403,10 @@ int main (int argc, char **argv)
        
                /* check trx file before erasing or writing anything */
                if (!image_check(imagefd, device)) {
-                       if ((quiet < 2) || !force)
-                               fprintf(stderr, "TRX check failed!\n");
-                       if (!force)
+                       if (!force) {
+                               fprintf(stderr, "Image check failed.\n");
                                exit(1);
+                       }
                } else {
                        if (!mtd_check(device)) {
                                fprintf(stderr, "Can't open device for writing!\n");
@@ -460,7 +450,7 @@ int main (int argc, char **argv)
                case CMD_WRITE:
                        if (quiet < 2)
                                fprintf(stderr, "Writing from %s to %s ... ", imagefile, device);
-                       mtd_write(imagefd, device, quiet);
+                       mtd_write(imagefd, device);
                        if (quiet < 2)
                                fprintf(stderr, "\n");
                        break;