X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/641016ec3d0d6c0deeec1feaf5624e9e7100ef49..eacd5dbffae57f6e167b6ef2c288730e2a1175c4:/package/mtd/src/mtd.c?ds=sidebyside

diff --git a/package/mtd/src/mtd.c b/package/mtd/src/mtd.c
index 1e9d316e4..0a968409a 100644
--- a/package/mtd/src/mtd.c
+++ b/package/mtd/src/mtd.c
@@ -28,19 +28,22 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdint.h>
+#include <sys/ioctl.h>
+#include <sys/syscall.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <error.h>
 #include <time.h>
+#include <string.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
 #include <sys/reboot.h>
-#include <string.h>
+#include <linux/reboot.h>
 
-#include <linux/mtd/mtd.h>
+#include "mtd.h"
 
 #define TRX_MAGIC       0x30524448      /* "HDR0" */
 #define BUFSIZE (16 * 1024)
@@ -64,8 +67,9 @@ 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;
@@ -121,6 +125,7 @@ image_check_bcom(int imagefd, const char *mtd)
 	close(fd);
 	return 1;
 }
+#endif /* target_brcm */
 
 int
 image_check(int imagefd, const char *mtd)
@@ -130,23 +135,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)
@@ -206,13 +197,18 @@ mtd_open(const char *mtd, int flags)
 	FILE *fp;
 	char dev[PATH_MAX];
 	int i;
+	int ret;
 
 	if ((fp = fopen("/proc/mtd", "r"))) {
 		while (fgets(dev, sizeof(dev), fp)) {
 			if (sscanf(dev, "mtd%d:", &i) && strstr(dev, mtd)) {
 				snprintf(dev, sizeof(dev), "/dev/mtd/%d", i);
+				if ((ret=open(dev, flags))<0) {
+					snprintf(dev, sizeof(dev), "/dev/mtd%d", i);
+					ret=open(dev, flags);
+				}
 				fclose(fp);
-				return open(dev, flags);
+				return ret;
 			}
 		}
 		fclose(fp);
@@ -247,11 +243,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);
@@ -473,8 +466,9 @@ int main (int argc, char **argv)
 
 	sync();
 	
-	if (boot)
-		kill(1, 15); // send SIGTERM to init for reboot
-
+	if (boot) {
+		fflush(stdout);
+		syscall(SYS_reboot,LINUX_REBOOT_MAGIC1,LINUX_REBOOT_MAGIC2,LINUX_REBOOT_CMD_RESTART,NULL);
+	}
 	return 0;
 }