From patchwork Mon Jun 22 02:45:44 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julian Calaby X-Patchwork-Id: 28967 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 6C9FAB71BA for ; Mon, 22 Jun 2009 12:46:02 +1000 (EST) Received: by ozlabs.org (Postfix) id 5D6C5DDDA0; Mon, 22 Jun 2009 12:46:02 +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 B796FDDD0C for ; Mon, 22 Jun 2009 12:46:01 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753034AbZFVCp5 (ORCPT ); Sun, 21 Jun 2009 22:45:57 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753090AbZFVCp5 (ORCPT ); Sun, 21 Jun 2009 22:45:57 -0400 Received: from mail-px0-f202.google.com ([209.85.216.202]:48212 "EHLO mail-px0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752894AbZFVCp4 (ORCPT ); Sun, 21 Jun 2009 22:45:56 -0400 Received: by pxi40 with SMTP id 40so1108034pxi.33 for ; Sun, 21 Jun 2009 19:45:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:cc:subject:content-type :content-transfer-encoding; bh=j005D2XabaHUdYGAAPZ6rxj2QnBxFxS/eqhxATKTZgQ=; b=OdNzU19aWa6lJWVwSoyq/pLChwwLC+Cqx/x2MCGYfNMK7oHtQ11PZpHQ1N1+V285Yh Wcs04WZM0TEVOA52HkmwFMaB2deIBEsZQwQ1iR/HgF6i9I+hP4bJkuSdvrrtQ62rGH/n l4XEiPRwBaHc0D29kHSEnK67ZawDBBjliXLgk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; b=ViRJByGtVf2sw3eH+s3qmCGXFBJVzGmF1CxjWUnfezHCPWfYWyWx1gKU1+MTVFSAVl lKMGzWaqbSQdRcN1hlB4Y6+bggHvclv48SItFhWXpgUdyT2owhPVc+/2QCqIhYh1Zf9t gnZG+YShBcYoQAzkU5wHbckpCcDntB2rCPP+E= Received: by 10.142.185.21 with SMTP id i21mr2433398wff.220.1245638759544; Sun, 21 Jun 2009 19:45:59 -0700 (PDT) Received: from ?192.168.2.115? (124-168-76-228.dyn.iinet.net.au [124.168.76.228]) by mx.google.com with ESMTPS id 20sm31724wfi.20.2009.06.21.19.45.56 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 21 Jun 2009 19:45:59 -0700 (PDT) Message-ID: <4A3EF058.2040800@gmail.com> Date: Mon, 22 Jun 2009 12:45:44 +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 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. --- I haven't signed this off as it's Robert's patch. Robert, if you approve of this, could you sign it off? Thanks, --- Sorry for the dupes! arch/sparc/boot/Makefile | 2 +- arch/sparc/boot/piggyback_32.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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;