From patchwork Fri Dec 31 09:39:39 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 77054 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 18DD4B70DA for ; Fri, 31 Dec 2010 21:08:31 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752108Ab0LaKIa (ORCPT ); Fri, 31 Dec 2010 05:08:30 -0500 Received: from pqueueb.post.tele.dk ([193.162.153.10]:34849 "EHLO pqueueb.post.tele.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750967Ab0LaKI3 (ORCPT ); Fri, 31 Dec 2010 05:08:29 -0500 Received: from pfepb.post.tele.dk (pfepb.post.tele.dk [195.41.46.236]) by pqueueb.post.tele.dk (Postfix) with ESMTP id 4CC508072 for ; Fri, 31 Dec 2010 10:40:01 +0100 (CET) Received: from localhost.localdomain (x1-6-00-1e-2a-84-ae-3e.k225.webspeed.dk [80.163.61.94]) by pfepb.post.tele.dk (Postfix) with ESMTP id 2A836F84029; Fri, 31 Dec 2010 10:39:41 +0100 (CET) From: Sam Ravnborg To: "David S. Miller" , sparclinux Cc: Sam Ravnborg Subject: [PATCH] sparc: remove obsolete ELF support in piggyback_32.c Date: Fri, 31 Dec 2010 10:39:39 +0100 Message-Id: <1293788379-32709-5-git-send-email-sam@ravnborg.org> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <20101231093628.GA19496@merkur.ravnborg.org> References: <20101231093628.GA19496@merkur.ravnborg.org> Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org As we always convert to a.out there is no need to support ELF. Removing ELF support because: - it is not used - it simplifies code to support a.out only Signed-off-by: Sam Ravnborg --- arch/sparc/boot/piggyback_32.c | 27 +++++---------------------- 1 files changed, 5 insertions(+), 22 deletions(-) diff --git a/arch/sparc/boot/piggyback_32.c b/arch/sparc/boot/piggyback_32.c index 5e856f2..369634d 100644 --- a/arch/sparc/boot/piggyback_32.c +++ b/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]);