From patchwork Mon Nov 29 18:56:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dirk Behme X-Patchwork-Id: 73479 X-Patchwork-Delegate: wd@denx.de 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 4A7E5B6F1E for ; Tue, 30 Nov 2010 05:57:35 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id EC274281AF; Mon, 29 Nov 2010 19:57:33 +0100 (CET) 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 ow4CgPeRTIJa; Mon, 29 Nov 2010 19:57:33 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6696C2827D; Mon, 29 Nov 2010 19:57:32 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0F07B2827D for ; Mon, 29 Nov 2010 19:57:31 +0100 (CET) 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 DBXsJA1X3pnj for ; Mon, 29 Nov 2010 19:57:29 +0100 (CET) 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-fx0-f44.google.com (mail-fx0-f44.google.com [209.85.161.44]) by theia.denx.de (Postfix) with ESMTP id 05F9B281AF for ; Mon, 29 Nov 2010 19:57:27 +0100 (CET) Received: by fxm9 with SMTP id 9so3616807fxm.3 for ; Mon, 29 Nov 2010 10:57:27 -0800 (PST) Received: by 10.223.86.194 with SMTP id t2mr5700096fal.40.1291057046792; Mon, 29 Nov 2010 10:57:26 -0800 (PST) Received: from [192.168.2.101] (p5B04236F.dip0.t-ipconnect.de [91.4.35.111]) by mx.google.com with ESMTPS id 21sm1334272fav.41.2010.11.29.10.57.25 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 29 Nov 2010 10:57:25 -0800 (PST) Message-ID: <4CF3F77B.9080505@googlemail.com> Date: Mon, 29 Nov 2010 19:56:59 +0100 From: Dirk Behme User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.12) Gecko/20101027 Thunderbird/3.1.6 MIME-Version: 1.0 To: Albert ARIBAUD References: <1288740321-1341-1-git-send-email-matt.waddel@linaro.org> <4CF3ED5F.50703@free.fr> In-Reply-To: <4CF3ED5F.50703@free.fr> Cc: u-boot@lists.denx.de, matt.waddel@linaro.org Subject: Re: [U-Boot] [PATCH 0/2] ARMV7: Fixing Vexpress build errors and warnings 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: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de On 29.11.2010 19:13, Albert ARIBAUD wrote: > Le 03/11/2010 00:25, matt.waddel@linaro.org a écrit : >> From: Matt Waddel >> >> These patches fix several build errors and warnings. A successful build for >> this platform depends on Steve Sakoman's "ARMV7: Fix build for non-OMAP3 >> boards" patch. >> >> Matt Waddel (2): >> ARMV7: Vexpress build errors >> ARMV7: Vexpress compile warnings >> >> arch/arm/include/asm/arch-armv7/sys_proto.h | 29 ++++++++++++ >> board/armltd/vexpress/ca9x4_ct_vxp.c | 9 +++- >> board/armltd/vexpress/config.mk | 3 +- >> board/armltd/vexpress/u-boot.lds | 65 --------------------------- >> 4 files changed, 36 insertions(+), 70 deletions(-) >> create mode 100644 arch/arm/include/asm/arch-armv7/sys_proto.h >> delete mode 100644 board/armltd/vexpress/u-boot.lds > > Wofgang, maybe I can take over u-boot-arm now and start by applying > these two patches (and let you pull u-boot-arm later this week)? With recent master, besides the two patches above, I additionally need something like below to get ca9x4_ct_vxp build: ARMV7: Vexpress: Fix build error Fix ca9x4_ct_vxp build error Configuring for ca9x4_ct_vxp board... board/armltd/vexpress/libvexpress.o: In function `udelay': u-boot.git/board/armltd/vexpress/ca9x4_ct_vxp.c:161: multiple definition of `udelay' lib/libgeneric.o:u-boot.git/lib/time.c:34: first defined here lib/libgeneric.o: In function `udelay': zlib.c:(.text+0x1ee8): undefined reference to `__udelay' Signed-of-by: Dirk Behme --- board/armltd/vexpress/ca9x4_ct_vxp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: u-boot.git/board/armltd/vexpress/ca9x4_ct_vxp.c =================================================================== --- u-boot.git.orig/board/armltd/vexpress/ca9x4_ct_vxp.c +++ u-boot.git/board/armltd/vexpress/ca9x4_ct_vxp.c @@ -157,7 +157,7 @@ void reset_cpu(ulong addr) * Delay x useconds AND perserve advance timstamp value * assumes timer is ticking at 1 msec */ -void udelay(ulong usec) +void __udelay(ulong usec) { ulong tmo, tmp;