From: Jon Loeliger <jdl@freescale.com>
Date: Tue, 10 Oct 2006 22:21:42 +0000 (-0500)
Subject: Merge branch 'master' of http://www.denx.de/git/u-boot
X-Git-Tag: U-Boot-1_1_6~20^2~1^2~13
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=daaba9859b0b94571dc3e45ad0c26e136426b351;p=oweals%2Fu-boot.git

Merge branch 'master' of www.denx.de/git/u-boot
---

daaba9859b0b94571dc3e45ad0c26e136426b351
diff --cc board/stxxtc/Makefile
index 2951b96a21,b575e235e1..424ab1cf9e
--- a/board/stxxtc/Makefile
+++ b/board/stxxtc/Makefile
@@@ -32,8 -32,16 +32,8 @@@ OBJS	:= $(addprefix $(obj),$(COBJS)
  SOBJS	:= $(addprefix $(obj),$(SOBJS))
  
  $(LIB):	$(obj).depend $(OBJS)
- 	$(AR) crv $@ $(OBJS)
+ 	$(AR) $(ARFLAGS) $@ $(OBJS)
  
 -$(obj)%.dtb: $(src)%.dts
 -	dtc -f -V 0x10 -I dts -O dtb $< >$@
 -
 -$(obj)%.c: $(obj)%.dtb
 -	xxd -i $< \
 -	   | sed -e "s/^unsigned char/const unsigned char/g" \
 -	   | sed -e "s/^unsigned int/const unsigned int/g" > $@
 -
  #########################################################################
  
  # defines $(obj).depend target