Merge with /home/wd/git/u-boot/master

diff --cc README
Simple merge

diff --cc board/cds/mpc8541cds/Makefile
index d202281d454d3f27f6f2e32a8bb82bef83dfd29c,d65eb1b3e691fd7f08f81b0efb88e65244c4d307..7f530988505d39b324834a910f5562d0faf1dad1
--- 1/board/cds/mpc8541cds/Makefile
--- 2/board/cds/mpc8541cds/Makefile
+++ b/board/cds/mpc8541cds/Makefile
@@@ -23,14 -23,15 +23,17 @@@
  #
  
  include $(TOPDIR)/config.mk
+ ifneq ($(OBJTREE),$(SRCTREE))
+ $(shell mkdir -p $(obj)../common)
+ endif
  
- LIB   = lib$(BOARD).a
+ LIB   = $(obj)lib$(BOARD).a
  
- OBJS  := $(BOARD).o \
+ COBJS := $(BOARD).o \
           ../common/cadmus.o \
 -         ../common/eeprom.o
 +         ../common/eeprom.o \
 +         ../common/ft_board.o \
 +         ../common/via.o
  
  SOBJS := init.o
  

diff --cc board/cds/mpc8548cds/Makefile
index d202281d454d3f27f6f2e32a8bb82bef83dfd29c,d65eb1b3e691fd7f08f81b0efb88e65244c4d307..7f530988505d39b324834a910f5562d0faf1dad1
--- 1/board/cds/mpc8548cds/Makefile
--- 2/board/cds/mpc8548cds/Makefile
+++ b/board/cds/mpc8548cds/Makefile
@@@ -23,14 -23,15 +23,17 @@@
  #
  
  include $(TOPDIR)/config.mk
+ ifneq ($(OBJTREE),$(SRCTREE))
+ $(shell mkdir -p $(obj)../common)
+ endif
  
- LIB   = lib$(BOARD).a
+ LIB   = $(obj)lib$(BOARD).a
  
- OBJS  := $(BOARD).o \
+ COBJS := $(BOARD).o \
           ../common/cadmus.o \
 -         ../common/eeprom.o
 +         ../common/eeprom.o \
 +         ../common/ft_board.o \
 +         ../common/via.o
  
  SOBJS := init.o
  

diff --cc board/cds/mpc8555cds/Makefile
index d202281d454d3f27f6f2e32a8bb82bef83dfd29c,d65eb1b3e691fd7f08f81b0efb88e65244c4d307..7f530988505d39b324834a910f5562d0faf1dad1
--- 1/board/cds/mpc8555cds/Makefile
--- 2/board/cds/mpc8555cds/Makefile
+++ b/board/cds/mpc8555cds/Makefile
@@@ -23,14 -23,15 +23,17 @@@
  #
  
  include $(TOPDIR)/config.mk
+ ifneq ($(OBJTREE),$(SRCTREE))
+ $(shell mkdir -p $(obj)../common)
+ endif
  
- LIB   = lib$(BOARD).a
+ LIB   = $(obj)lib$(BOARD).a
  
- OBJS  := $(BOARD).o \
+ COBJS := $(BOARD).o \
           ../common/cadmus.o \
 -         ../common/eeprom.o
 +         ../common/eeprom.o \
 +         ../common/ft_board.o \
 +         ../common/via.o
  
  SOBJS := init.o
  

diff --cc board/stxxtc/Makefile
index 8c529a0611d101d868c380548d562a17edaecc23,b575e235e13777a07f6f5b67fe63db261f88e3f3..424ab1cf9e3251575e95a3faf767cfc87b765cf2
--- 1/board/stxxtc/Makefile
--- 2/board/stxxtc/Makefile
+++ b/board/stxxtc/Makefile
@@@ -23,18 -23,30 +23,22 @@@
  
  include $(TOPDIR)/config.mk
  
- LIB   = lib$(BOARD).a
+ LIB   = $(obj)lib$(BOARD).a
  
- OBJS  = $(BOARD).o
 -COBJS = $(BOARD).o oftree.o
++COBJS = $(BOARD).o
  
- $(LIB):       .depend $(OBJS)
-       $(AR) crv $@ $(OBJS)
+ SRCS  := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+ OBJS  := $(addprefix $(obj),$(COBJS))
+ SOBJS := $(addprefix $(obj),$(SOBJS))
+ 
+ $(LIB):       $(obj).depend $(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" > $@
 -
  #########################################################################
  
- .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 common/cmd_bootm.c
Simple merge

diff --cc common/ft_build.c
Simple merge

diff --cc include/image.h
Simple merge

diff --cc tools/mkimage.c
Simple merge