From a0239e4b40523125458cc69b0084499f33c91a84 Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Tue, 4 Jan 2011 11:39:14 +0000
Subject: [PATCH] --- yaml --- r: 225727 b: refs/heads/master c:
 571e08f6e2ddd6ec5d547358f55342726c063072 h: refs/heads/master i:   225725:
 728de00b12f946f460eb7931213f05e36c6b2826   225723:
 52010c86be07d65177dcd42bc8bb4d05c98df3e8   225719:
 92f35e6123cce0e51d6e225d21fff3a15fd451f1   225711:
 5c2f5ec08f5524a315da7fb1847e3061220e7b37   225695:
 8e353440ef06e7f88e57e284379a74904fc84a27   225663:
 1bc7c3a94ee254a97b0f1a88323d694f16fb5e95 v: v3

---
 [refs]                               |  2 +-
 trunk/arch/sparc/boot/piggyback_32.c | 27 +++++----------------------
 2 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/[refs] b/[refs]
index e2feaaa4ceaa..67193a2824b8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c239053045568abf960b01e4eb2c7205e3cd7d6
+refs/heads/master: 571e08f6e2ddd6ec5d547358f55342726c063072
diff --git a/trunk/arch/sparc/boot/piggyback_32.c b/trunk/arch/sparc/boot/piggyback_32.c
index 5e856f2e9e0f..369634d8271e 100644
--- a/trunk/arch/sparc/boot/piggyback_32.c
+++ b/trunk/arch/sparc/boot/piggyback_32.c
@@ -44,12 +44,6 @@ static unsigned short ld2(char *p)
 	return (p[0] << 8) | p[1];
 }
 
-/* read 4 bytes as big endian */
-static unsigned int ld4(char *p)
-{
-	return (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3];
-}
-
 /* save 4 bytes as big endian */
 static void st4(char *p, unsigned int x)
 {
@@ -130,7 +124,7 @@ int main(int argc,char **argv)
 {
 	static char aout_magic[] = { 0x01, 0x03, 0x01, 0x07 };
 	char buffer[1024], *q, *r;
-	unsigned int i, j, k, start, end, offset;
+	unsigned int i, start, end, offset;
 	struct stat s;
 	int image, tail;
 
@@ -147,21 +141,10 @@ int main(int argc,char **argv)
 		die(argv[1]);
 	if (read(image, buffer, 512) != 512)
 		die(argv[1]);
-	if (memcmp (buffer, "\177ELF", 4) == 0) {
-		q = buffer + ld4(buffer + 28);
-		i = ld4(q + 4) + ld4(buffer + 24) - ld4(q + 8);
-		if (lseek(image, i, 0) < 0)
-			die("lseek");
-		if (read(image, buffer, 512) != 512)
-			die(argv[1]);
-		j = 0;
-	} else if (memcmp(buffer, aout_magic, 4) == 0) {
-		i = j = AOUT_TEXT_OFFSET;
-	} else {
-		fprintf (stderr, "Not ELF nor a.out. Don't blame me.\n");
+	if (memcmp(buffer, aout_magic, 4) != 0) {
+		fprintf (stderr, "Not a.out. Don't blame me.\n");
 		exit(1);
 	}
-	k = i;
 	/*
 	 * We need to fill in values for sparc_ramdisk_image + sparc_ramdisk_size
 	 * To locate these symbols search for the "HdrS" text which appear
@@ -170,7 +153,7 @@ int main(int argc,char **argv)
 	 */
 
 	/*  Find the gokernel label */
-	i += (ld2(buffer + j + 2) << 2) - 512;
+	i = AOUT_TEXT_OFFSET + (ld2(buffer + AOUT_TEXT_OFFSET + 2) << 2) - 512;
 	if (lseek(image, i, 0) < 0)
 		die("lseek");
 	if (read(image, buffer, 1024) != 1024)
@@ -203,7 +186,7 @@ int main(int argc,char **argv)
 		die(argv[1]);
 
 	/* seek page aligned boundary in the image file and add boot image */
-	if (lseek(image, k - start + ((end + 32 + 4095) & ~4095), 0) < 0)
+	if (lseek(image, AOUT_TEXT_OFFSET - start + ((end + 32 + 4095) & ~4095), 0) < 0)
 		die("lseek");
 	if ((tail = open(argv[3],O_RDONLY)) < 0)
 		die(argv[3]);