From: Stefan Roese <sr@denx.de>
Date: Sat, 31 Mar 2007 11:44:12 +0000 (+0200)
Subject: Merge with git://www.denx.de/git/u-boot.git
X-Git-Tag: v2008.10-rc1~951^2~17
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0e7d4916afaf83083b9b70ad779f29f7b57bd8ed;p=platform%2Fkernel%2Fu-boot.git

Merge with git://www.denx.de/git/u-boot.git
---

0e7d4916afaf83083b9b70ad779f29f7b57bd8ed
diff --cc board/amcc/acadia/Makefile
index 183f694,183f694..abcbf3e
--- a/board/amcc/acadia/Makefile
+++ b/board/amcc/acadia/Makefile
@@@ -23,25 -23,25 +23,29 @@@
  
  include $(TOPDIR)/config.mk
  
--LIB	= lib$(BOARD).a
++LIB	= $(obj)lib$(BOARD).a
  
--OBJS	= $(BOARD).o cpr.o memory.o
++COBJS	= $(BOARD).o cpr.o memory.o
  SOBJS	=
  
--$(LIB):	$(OBJS) $(SOBJS)
--	$(AR) crv $@ $(OBJS) $(SOBJS)
++SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
++OBJS	:= $(addprefix $(obj),$(COBJS))
++SOBJS	:= $(addprefix $(obj),$(SOBJS))
++
++$(LIB):	$(obj).depend $(OBJS) $(SOBJS)
++	$(AR) $(ARFLAGS) $@ $(OBJS)
  
  clean:
  	rm -f $(SOBJS) $(OBJS)
  
  distclean:	clean
--	rm -f $(LIB) core *.bak .depend
++	rm -f $(LIB) core *.bak .depend *~
  
  #########################################################################
  
--.depend:	Makefile $(SOBJS:.o=.S) $(OBJS:.o=.c)
--		$(CC) -M $(CFLAGS) $(SOBJS:.o=.S) $(OBJS:.o=.c) > $@
++# defines $(obj).depend target
++include $(SRCTREE)/rules.mk
  
--sinclude .depend
++sinclude $(obj).depend
  
  #########################################################################
diff --cc board/amcc/acadia/config.mk
index 1524bad,ce21374..c8566ec
--- a/board/amcc/acadia/config.mk
+++ b/board/amcc/acadia/config.mk
@@@ -21,8 -21,8 +21,6 @@@
  # MA 02111-1307 USA
  #
  
--sinclude $(TOPDIR)/board/amcc/liveoak/config.tmp
--
  ifndef TEXT_BASE
  TEXT_BASE = 0xFFFC0000
  endif