From patchwork Sat Jul 30 17:28:49 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: seedshope X-Patchwork-Id: 107508 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 DF887B6F68 for ; Sun, 31 Jul 2011 03:36:17 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0446D2811E; Sat, 30 Jul 2011 19:36:14 +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 qhKgWEntmkjA; Sat, 30 Jul 2011 19:36:13 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id EA3EF2811F; Sat, 30 Jul 2011 19:36:11 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5F2DC2811F for ; Sat, 30 Jul 2011 19:36:08 +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 84iWucwzlFU8 for ; Sat, 30 Jul 2011 19:36:07 +0200 (CEST) X-Greylist: delayed 420 seconds by postgrey-1.27 at theia; Sat, 30 Jul 2011 19:36:06 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 mail-pz0-f48.google.com (mail-pz0-f48.google.com [209.85.210.48]) by theia.denx.de (Postfix) with ESMTPS id 269842811E for ; Sat, 30 Jul 2011 19:36:06 +0200 (CEST) Received: by pzk32 with SMTP id 32so8083609pzk.21 for ; Sat, 30 Jul 2011 10:36:04 -0700 (PDT) Received: by 10.68.50.2 with SMTP id y2mr4241827pbn.23.1312046948632; Sat, 30 Jul 2011 10:29:08 -0700 (PDT) Received: from localhost.localdomain ([221.221.20.140]) by mx.google.com with ESMTPS id v2sm3216810pbi.51.2011.07.30.10.29.05 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 30 Jul 2011 10:29:07 -0700 (PDT) From: Zhong Hongbo To: Minkyu Kang , Albert ARIBAUD Date: Sun, 31 Jul 2011 01:28:49 +0800 Message-Id: <1312046929-10260-2-git-send-email-bocui107@gmail.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1312046929-10260-1-git-send-email-bocui107@gmail.com> References: <1312046929-10260-1-git-send-email-bocui107@gmail.com> Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH] Fix the Double defind for setenv 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 From: seedshope setenv is defined common.h. We do not need re-defined it Zhong hongbo --- arch/arm/include/asm/u-boot-arm.h | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/arch/arm/include/asm/u-boot-arm.h b/arch/arm/include/asm/u-boot-arm.h index 3904027..e3fbb53 100644 --- a/arch/arm/include/asm/u-boot-arm.h +++ b/arch/arm/include/asm/u-boot-arm.h @@ -57,14 +57,6 @@ void dram_init_banksize (void); void setup_serial_tag (struct tag **params); void setup_revision_tag (struct tag **params); -/* ------------------------------------------------------------ */ -/* Here is a list of some prototypes which are incompatible to */ -/* the U-Boot implementation */ -/* To be fixed! */ -/* ------------------------------------------------------------ */ -/* common/cmd_nvedit.c */ -int setenv (char *, char *); - /* cpu/.../interrupt.c */ int arch_interrupt_init (void); void reset_timer_masked (void);