[LV-kern-commit] CVS: kernel-2.4/arch/ppc/boot/utils mksimage.c,1.1,1.2 offset,1.1,1.2 sioffset,1.1,1.2 sisize,1.1,1.2 size,1.1,1.2

[Dave A. <ai...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/arch/ppc/boot/utils
In directory sc8-pr-cvs1:/tmp/cvs-serv23180/arch/ppc/boot/utils

Modified Files:
	mksimage.c offset sioffset sisize size 
Log Message:
DA: sync to Marcelo 2.4.18 + remove init_mmap (no longer needed)


Index: mksimage.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/ppc/boot/utils/mksimage.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mksimage.c	10 Apr 2002 15:04:02 -0000	1.1
+++ mksimage.c	10 Jun 2003 01:46:02 -0000	1.2
@@ -1,5 +1,5 @@
 /*
- * BK Id: SCCS/s.mksimage.c 1.6 05/18/01 15:16:42 cort
+ * BK Id: SCCS/s.mksimage.c 1.7 10/11/01 11:59:05 trini
  */
 /*
  *
@@ -96,7 +96,7 @@
 		die("can't open loader: %s", strerror(errno));
 
 	copy_blocks(fd, ofd, &ld_off, &ld_size);
-	len = sprintf(buffer, "bootloader: %x %x\n", ld_off, ld_size);
+	len = sprintf(buffer, "bootloader: %lx %lx\n", ld_off, ld_size);
 	close(fd);
 
 	fd = open(kernel, O_RDONLY);
@@ -104,7 +104,7 @@
 		die("can't open kernel: %s", strerror(errno));
 
 	copy_blocks(fd, ofd, &kern_off, &kern_size);
-	len += sprintf(buffer+len, "zimage: %x %x\n", kern_off, kern_size);
+	len += sprintf(buffer+len, "zimage: %lx %lx\n", kern_off, kern_size);
 	close(fd);
 	
 	if (rdimage) {
@@ -116,7 +116,7 @@
 		close(fd);
 	}
 
-	len += sprintf(buffer+len, "initrd: %x %x", rd_off, rd_size);
+	len += sprintf(buffer+len, "initrd: %lx %lx", rd_off, rd_size);
 
 	close(ofd);
 

Index: offset
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/ppc/boot/utils/offset,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- offset	10 Apr 2002 15:04:02 -0000	1.1
+++ offset	10 Jun 2003 01:46:02 -0000	1.2
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
-OFFSET=`$1 -h $2  | grep $3 | grep -v zvmlinux| awk '{print $6}'`
+OFFSET=`$1 -h $2 | grep $3 | grep -v zvmlinux | awk '{print $6}'`
 echo "0x"$OFFSET

Index: sioffset
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/ppc/boot/utils/sioffset,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sioffset	10 Apr 2002 15:04:02 -0000	1.1
+++ sioffset	10 Jun 2003 01:46:02 -0000	1.2
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 OFFSET=`grep $1 sImage.map | awk '{print $2}'`
 echo "0x"$OFFSET

Index: sisize
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/ppc/boot/utils/sisize,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sisize	10 Apr 2002 15:04:03 -0000	1.1
+++ sisize	10 Jun 2003 01:46:02 -0000	1.2
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 OFFSET=`grep $1 sImage.map | awk '{print $3}'`
 echo "0x"$OFFSET

Index: size
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/ppc/boot/utils/size,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- size	10 Apr 2002 15:04:03 -0000	1.1
+++ size	10 Jun 2003 01:46:02 -0000	1.2
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
-OFFSET=`$1 -h $2  | grep $3 | grep -v zvmlinux | awk '{print $3}'`
+OFFSET=`$1 -h $2 | grep $3 | grep -v zvmlinux | awk '{print $3}'`
 echo "0x"$OFFSET