From patchwork Mon Aug 1 04:05:20 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lei Wen X-Patchwork-Id: 107656 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id CC57FB6F89 for ; Mon, 1 Aug 2011 14:05:33 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 09AAF2811F; Mon, 1 Aug 2011 06:05:30 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id U+ABPOIGl9wj; Mon, 1 Aug 2011 06:05:29 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2EFF628122; Mon, 1 Aug 2011 06:05:28 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 91CCD28122 for ; Mon, 1 Aug 2011 06:05:26 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JG3Pa5CjWInN for ; Mon, 1 Aug 2011 06:05:25 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from dakia2.marvell.com (dakia2.marvell.com [65.219.4.35]) by theia.denx.de (Postfix) with ESMTPS id 68D182811F for ; Mon, 1 Aug 2011 06:05:23 +0200 (CEST) X-ASG-Debug-ID: 1312171521-082cfa780001-4l7tJC Received: from maili.marvell.com (maili.marvell.com [10.68.76.51]) by dakia2.marvell.com with ESMTP id bwIziqzxaomWbjHO for ; Sun, 31 Jul 2011 21:05:21 -0700 (PDT) X-Barracuda-Envelope-From: leiwen@marvell.com Received: from localhost (sh4-dt.marvell.com [10.38.164.158]) by maili.marvell.com (Postfix) with ESMTP id E36458A002 for ; Sun, 31 Jul 2011 21:05:20 -0700 (PDT) From: Lei Wen To: u-boot@lists.denx.de X-ASG-Orig-Subj: [PATCH] ARM: fix build error Date: Sun, 31 Jul 2011 21:05:20 -0700 X-ASG-Orig-Subj: [PATCH] ARM: fix build error Message-Id: <1312171520-24430-1-git-send-email-leiwen@marvell.com> X-Mailer: git-send-email 1.7.0.4 X-Barracuda-Connect: maili.marvell.com[10.68.76.51] X-Barracuda-Start-Time: 1312171521 X-Barracuda-URL: http://10.68.76.222:80/cgi-mod/mark.cgi X-Barracuda-Spam-Score: -1002.00 X-Barracuda-Spam-Status: No, SCORE=-1002.00 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=1000.0 Subject: [U-Boot] [PATCH] ARM: fix build error X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de error message: /home/leiwen/reps/clones/uboot/include/asm/u-boot-arm.h:66: error: conflicting types for 'setenv' /home/leiwen/reps/clones/uboot/include/common.h:271: note: previous declaration of 'setenv' was here Since common code has change the setenv declaration method, follow the common code to do the same change. Signed-off-by: Lei Wen --- arch/arm/include/asm/u-boot-arm.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/include/asm/u-boot-arm.h b/arch/arm/include/asm/u-boot-arm.h index 3904027..b01a0e9 100644 --- a/arch/arm/include/asm/u-boot-arm.h +++ b/arch/arm/include/asm/u-boot-arm.h @@ -63,7 +63,7 @@ void setup_revision_tag (struct tag **params); /* To be fixed! */ /* ------------------------------------------------------------ */ /* common/cmd_nvedit.c */ -int setenv (char *, char *); +int setenv (const char *, const char *); /* cpu/.../interrupt.c */ int arch_interrupt_init (void);