From dead6fde5190cfcf868e6b46299879c9eb72a886 Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 4 Mar 2005 07:59:08 +0000
Subject: last minute bugfixes

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@305 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/openwrt/jffs2root.c | 4 +++-
 package/openwrt/mtd.c       | 6 +-----
 package/openwrt/openwrt.mk  | 4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'package/openwrt')

diff --git a/package/openwrt/jffs2root.c b/package/openwrt/jffs2root.c
index 2ff37fdad..77519a4a6 100644
--- a/package/openwrt/jffs2root.c
+++ b/package/openwrt/jffs2root.c
@@ -84,11 +84,13 @@ int main(int argc, char **argv)
     if (argc > 1 && !strcmp(argv[1],"--move")) {
       if (ptr->offsets[1] >= ptr->len) {
         printf("Partition already moved outside trx\n");
+#if 0
       } else if (ptr->offsets[1] & 0x0001ffff) {
         printf("Partition does not start on a block boundary\n");
+#endif
       } else {
 	init_crc32();
-	bzero((void *)((int)ptr + ptr->len), (size_t)(len - ptr->len));
+	//bzero((void *)((int)ptr + ptr->len), (size_t)(len - ptr->len));
         ptr->len = ptr->offsets[1];
         ptr->crc32 = crc32buf((void *) &(ptr->flag_version), ptr->len - offsetof(struct trx_header, flag_version));
 	msync(ptr,len,MS_SYNC|MS_INVALIDATE);
diff --git a/package/openwrt/mtd.c b/package/openwrt/mtd.c
index ff104c657..296bf4b63 100644
--- a/package/openwrt/mtd.c
+++ b/package/openwrt/mtd.c
@@ -140,11 +140,7 @@ mtd_erase(const char *mtd)
 		 mtdEraseInfo.start < mtdInfo.size;
 		 mtdEraseInfo.start += mtdInfo.erasesize) {
 		
-		if(ioctl(fd, MEMUNLOCK, &mtdEraseInfo)) {
-			fprintf(stderr, "Could not unlock MTD device: %s\n", mtd);
-			close(fd);
-			exit(1);
-		}
+		ioctl(fd, MEMUNLOCK, &mtdEraseInfo);
 		if(ioctl(fd, MEMERASE, &mtdEraseInfo)) {
 			fprintf(stderr, "Could not erase MTD device: %s\n", mtd);
 			close(fd);
diff --git a/package/openwrt/openwrt.mk b/package/openwrt/openwrt.mk
index 765f511d6..bc6e97e60 100644
--- a/package/openwrt/openwrt.mk
+++ b/package/openwrt/openwrt.mk
@@ -112,7 +112,7 @@ openwrt-mtd-clean:
 OPENWRT_JFFS2ROOT_SOURCE=package/openwrt/jffs2root.c
 OPENWRT_JFFS2ROOT_TARGET_BINARY:=sbin/jffs2root
 
-$(TARGET_DIR)/$(OPENWRT_JFFS2ROOT_TARGET_BINARY): 
+$(TARGET_DIR)/$(OPENWRT_JFFS2ROOT_TARGET_BINARY): openwrt
 		$(TARGET_CC) -o $(TARGET_DIR)/$(OPENWRT_JFFS2ROOT_TARGET_BINARY) $(OPENWRT_JFFS2ROOT_SOURCE)
 
 openwrt-jffs2root: $(TARGET_DIR)/$(OPENWRT_JFFS2ROOT_TARGET_BINARY)
@@ -160,7 +160,7 @@ SSTRIP=$(OPENWRT_SSTRIP_TARGET)
 
 linksys:	linksys-shared linksys-nvram linksys-wlconf
 
-openwrt:	linksys openwrt-mtd openwrt-trx openwrt-addpattern openwrt-jffs2root openwrt-sstrip
+openwrt:	linksys openwrt-mtd openwrt-trx openwrt-addpattern openwrt-sstrip
 
 openwrt-dirclean: linksys-shared-dirclean linksys-nvram-dirclean linksys-wlconf-dirclean
 
-- 
cgit v1.2.3