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

diff --cc Makefile
Simple merge

diff --cc board/amcc/acadia/Makefile
index 183f694c7b88dc22a13ff4b19982ce1b4f09d39e,183f694c7b88dc22a13ff4b19982ce1b4f09d39e..abcbf3e439cb01454ae57f6bf9ed362595d27d37
--- 1/board/amcc/acadia/Makefile
--- 2/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 1524bad7727d32b1760ca14cb01786b49cb63d9d,ce21374658987ce190807f79ac861b0e7991239b..c8566ecc7b6d32d6a5d74d5dce0c4ec1cbdd63a5
--- 1/board/amcc/acadia/config.mk
--- 2/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