mtd/util Makefile,1.28,1.29 erase.c,1.9,1.10

joern at infradead.org joern at infradead.org
Tue Mar 4 04:12:06 EST 2003


Update of /home/cvs/mtd/util
In directory phoenix.infradead.org:/tmp/cvs-serv6919

Modified Files:
	Makefile erase.c 
Log Message:
Citing Robert Schwebel:
Here are two patches against current CVS; the first one fixes the
utils/Makefile, the second one removes some warnings for erase.c.



Index: Makefile
===================================================================
RCS file: /home/cvs/mtd/util/Makefile,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Makefile	18 Feb 2003 11:36:08 -0000	1.28
+++ Makefile	4 Mar 2003 09:12:03 -0000	1.29
@@ -24,12 +24,12 @@
 	ln -sf ../fs/jffs2/$@ $@
 
 mkfs.jffs2: crc32.o compr_rtime.o mkfs.jffs2.o compr_zlib.o
-	$(CC) $(CFLAGS) -o $@ $^ -lz
+	$(CC) $(LDFLAGS) -o $@ $^ -lz
 
 eraseall: crc32.o eraseall.o
-	$(CC) $(CFLAGS) -o $@ $^ -lz
+	$(CC) $(LDLAGS) -o $@ $^ -lz
 
 jffs2reader: jffs2reader.o
-	$(CC) $(CFLAGS) -o $@ $^ -lz 
+	$(CC) $(LDFLAGS) -o $@ $^ -lz 
 
 

Index: erase.c
===================================================================
RCS file: /home/cvs/mtd/util/erase.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- erase.c	17 May 2002 08:54:31 -0000	1.9
+++ erase.c	4 Mar 2003 09:12:03 -0000	1.10
@@ -62,7 +62,7 @@
 				return 8;
 			}
 		}
-		printf("\rPerforming Flash Erase of length %lu at offset 0x%lx",
+		printf("\rPerforming Flash Erase of length %u at offset 0x%x",
 				erase.length, erase.start);
 		fflush(stdout);
 		if(ioctl(Fd, MEMERASE, &erase) != 0)
@@ -99,14 +99,14 @@
 		erase.length = meminfo.erasesize;
 
 		for (; count > 0; count--) {
-			printf("\rPerforming Flash Erase of length %lu at offset 0x%lx",
+			printf("\rPerforming Flash Erase of length %u at offset 0x%x",
 					erase.length, erase.start);
 			fflush(stdout);
 
 			if(unlock != 0)
 			{
 				//Unlock the sector first.
-				printf("\rPerforming Flash unlock at offset 0x%lx",erase.start);
+				printf("\rPerforming Flash unlock at offset 0x%x",erase.start);
 				if(ioctl(Fd, MEMUNLOCK, &erase) != 0)
 				{
 					perror("\nMTD Unlock failure");





More information about the linux-mtd-cvs mailing list