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

Conflicts:

	board/stxxtc/Makefile

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
index 8cc2664c430ca54e7c66a64ccfe54c199ff26d15,ccf7f9f88fc65bf6c7fdc2d7d662e402604ff583..c0621f68697f5bcf47c044c24f718aa8afdfa932
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1466,24 -1636,17 +1639,25 @@@ TQM8540_config               
  TQM8541_config                \
  TQM8555_config                \
  TQM8560_config:               unconfig
+       @mkdir -p $(obj)include
        @CTYPE=$(subst TQM,,$(@:_config=)); \
-       >include/config.h ; \
+       >$(obj)include/config.h ; \
        echo "... TQM"$${CTYPE}; \
-       echo "#define CONFIG_MPC$${CTYPE}">>include/config.h; \
-       echo "#define CONFIG_TQM$${CTYPE}">>include/config.h; \
-       echo "#define CONFIG_HOSTNAME tqm$${CTYPE}">>include/config.h; \
-       echo "#define CONFIG_BOARDNAME \"TQM$${CTYPE}\"">>include/config.h; \
-       echo "#define CFG_BOOTFILE \"bootfile=/tftpboot/tqm$${CTYPE}/uImage\0\"">>include/config.h
-       @./mkconfig -a TQM85xx ppc mpc85xx tqm85xx
+       echo "#define CONFIG_MPC$${CTYPE}">>$(obj)include/config.h; \
+       echo "#define CONFIG_TQM$${CTYPE}">>$(obj)include/config.h; \
+       echo "#define CONFIG_HOSTNAME tqm$${CTYPE}">>$(obj)include/config.h; \
+       echo "#define CONFIG_BOARDNAME \"TQM$${CTYPE}\"">>$(obj)include/config.h; \
+       echo "#define CFG_BOOTFILE \"bootfile=/tftpboot/tqm$${CTYPE}/uImage\0\"">>$(obj)include/config.h
+       @$(MKCONFIG) -a TQM85xx ppc mpc85xx tqm85xx
  
 +#########################################################################
 +## MPC86xx Systems
 +#########################################################################
 +
 +MPC8641HPCN_config:    unconfig
 +      @./mkconfig $(@:_config=) ppc mpc86xx mpc8641hpcn
 +
 +
  #########################################################################
  ## 74xx/7xx Systems
  #########################################################################

diff --cc README
Simple merge

diff --cc board/cds/mpc8541cds/Makefile
index d202281d454d3f27f6f2e32a8bb82bef83dfd29c,3f3a51721ad56354225fc85da116e2d14141eef3..9aad5d5fa092e8583e9dce45abb722a72754c89c
--- 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,3f3a51721ad56354225fc85da116e2d14141eef3..9aad5d5fa092e8583e9dce45abb722a72754c89c
--- 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,3f3a51721ad56354225fc85da116e2d14141eef3..9aad5d5fa092e8583e9dce45abb722a72754c89c
--- 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,807da06e6cfce4f1a6ec36acf44d7aa93b67f2e8..2951b96a210d26bf0b3a913bb0720f936a013873
--- 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)
+ SRCS  := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+ OBJS  := $(addprefix $(obj),$(COBJS))
+ SOBJS := $(addprefix $(obj),$(SOBJS))
+ 
+ $(LIB):       $(obj).depend $(OBJS)
        $(AR) crv $@ $(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/Makefile
index a62bc16e85d8032ef7c78573e577829f965867aa,d626fe4d4ba6ae2c8dbba9a56ef40a9d36f8cf35..5ff8f93503bc83e5145129f8d8fae5a32970daba
--- 1/common/Makefile
--- 2/common/Makefile
+++ b/common/Makefile
@@@ -51,9 -51,10 +51,10 @@@ COBJS       = main.o ACEX1K.o altera.o bedbug
          memsize.o miiphybb.o miiphyutil.o \
          s_record.o serial.o soft_i2c.o soft_spi.o spartan2.o spartan3.o \
          usb.o usb_kbd.o usb_storage.o \
 -        virtex2.o xilinx.o crc16.o xyzModem.o
 +        virtex2.o xilinx.o crc16.o xyzModem.o cmd_mac.o
  
- OBJS  = $(AOBJS) $(COBJS)
+ SRCS  := $(AOBJS:.o=.S) $(COBJS:.o=.c)
+ OBJS  := $(addprefix $(obj),$(AOBJS) $(COBJS))
  
  CPPFLAGS += -I..
  

diff --cc drivers/Makefile
Simple merge

diff --cc include/asm-ppc/processor.h
Simple merge

diff --cc include/asm-ppc/u-boot.h
Simple merge

diff --cc include/common.h
Simple merge

diff --cc lib_ppc/board.c
Simple merge

diff --cc tools/mkimage.c
Simple merge