From patchwork Mon Jun 22 02:42:53 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julian Calaby X-Patchwork-Id: 28972 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 2C631B7162 for ; Mon, 22 Jun 2009 12:53:37 +1000 (EST) Received: by ozlabs.org (Postfix) id 1EDEFDDDA1; Mon, 22 Jun 2009 12:53:37 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id A7B7BDDDA0 for ; Mon, 22 Jun 2009 12:53:36 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752741AbZFVCxc (ORCPT ); Sun, 21 Jun 2009 22:53:32 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753367AbZFVCxb (ORCPT ); Sun, 21 Jun 2009 22:53:31 -0400 Received: from mx05.syd.iprimus.net.au ([210.50.30.235]:29986 "EHLO mx05.syd.iprimus.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752741AbZFVCxb (ORCPT ); Sun, 21 Jun 2009 22:53:31 -0400 X-Greylist: delayed 614 seconds by postgrey-1.27 at vger.kernel.org; Sun, 21 Jun 2009 22:53:25 EDT X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AiUFAJSMPko6srcd/2dsb2JhbACBUctPhAoF X-IronPort-AV: E=Sophos;i="4.42,265,1243778400"; d="scan'208";a="197448216" Received: from 29.149.dsl.mel.iprimus.net.au (HELO ADLMAIL.adlizard.com) ([58.178.183.29]) by smtp05.syd.iprimus.net.au with ESMTP; 22 Jun 2009 12:43:09 +1000 Received: from [192.168.2.115] ([124.168.76.228]) by ADLMAIL.adlizard.com with Microsoft SMTPSVC(6.0.3790.3959); Mon, 22 Jun 2009 12:43:06 +1000 Message-ID: <4A3EEFAD.7090905@julian.is-a-geek.org> Date: Mon, 22 Jun 2009 12:42:53 +1000 From: Julian Calaby User-Agent: Mozilla-Thunderbird 2.0.0.19 (X11/20090103) MIME-Version: 1.0 To: sparclinux CC: oftedal@gmail.com, David Miller , sam@ravnborg.org, reif@earthlink.net Subject: [PATCH 2/4] sparc32: Apply Robert Reif's changes X-OriginalArrivalTime: 22 Jun 2009 02:43:07.0457 (UTC) FILETIME=[2C7BAB10:01C9F2E3] Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org From: Robert Reif Fix obvious build issues for sparc32 tftpboot.img build. Signed-off-by: Robert Reif --- I haven't signed this off as it's Robert's patch. Robert, if you approve of this, could you sign it off? Thanks, --- arch/sparc/boot/Makefile | 2 +- arch/sparc/boot/piggyback_32.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/sparc/boot/Makefile b/arch/sparc/boot/Makefile index 96041a8..5e2caeb 100644 --- a/arch/sparc/boot/Makefile +++ b/arch/sparc/boot/Makefile @@ -58,7 +58,7 @@ $(obj)/image: $(obj)/btfix.o FORCE $(obj)/zImage: $(obj)/image $(call if_changed,strip) -$(obj)/tftpboot.img: $(obj)/piggyback $(obj)/System.map $(obj)/image FORCE +$(obj)/tftpboot.img: $(obj)/piggyback_32 $(obj)/System.map $(obj)/image FORCE $(call if_changed,elftoaout) $(call if_changed,piggy) diff --git a/arch/sparc/boot/piggyback_32.c b/arch/sparc/boot/piggyback_32.c index c9f500c..3f0f933 100644 --- a/arch/sparc/boot/piggyback_32.c +++ b/arch/sparc/boot/piggyback_32.c @@ -70,7 +70,7 @@ void die(char *str) int main(int argc,char **argv) { static char aout_magic[] = { 0x01, 0x03, 0x01, 0x07 }; - unsigned char buffer[1024], *q, *r; + char buffer[1024], *q, *r; unsigned int i, j, k, start, end, offset; FILE *map; struct stat s;