diff mbox

[U-Boot,0/2] ARMV7: Fixing Vexpress build errors and warnings

Message ID 4CF3F77B.9080505@googlemail.com
State Accepted
Delegated to: Wolfgang Denk
Headers show

Commit Message

Dirk Behme Nov. 29, 2010, 6:56 p.m. UTC 
On 29.11.2010 19:13, Albert ARIBAUD wrote:
> Le 03/11/2010 00:25, matt.waddel@linaro.org a écrit :
>> From: Matt Waddel<matt.waddel@linaro.org>
>>
>> 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 <dirk.behme@googlemail.com>

---
  board/armltd/vexpress/ca9x4_ct_vxp.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Wolfgang Denk Dec. 8, 2010, 10:47 p.m. UTC | #1 
Dear Dirk Behme,

In message <4CF3F77B.9080505@googlemail.com> you wrote:
>
> 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 <dirk.behme@googlemail.com>
> 
> ---
>   board/armltd/vexpress/ca9x4_ct_vxp.c |    2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks.

Best regards,

Wolfgang Denk
diff mbox

Patch

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;