Merge with /home/wd/git/u-boot/custodian/u-boot-mpc85xx

diff --combined Makefile
index 86cb5c839d8e625adec129b5c4a1699e62000e13,a9d56ecb20e3535c58caf37e35fb83cd701dd9e3..ceee2c7bed3ad5ee4f7a33e23dd51a164a5e0d22
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -197,9 -197,6 +197,9 @@@ LIBS += cpu/$(CPU)/lib$(CPU).
  ifdef SOC
  LIBS += cpu/$(CPU)/$(SOC)/lib$(SOC).a
  endif
 +ifeq ($(CPU),ixp)
 +LIBS += cpu/ixp/npe/libnpe.a
 +endif
  LIBS += lib_$(ARCH)/lib$(ARCH).a
  LIBS += fs/cramfs/libcramfs.a fs/fat/libfat.a fs/fdos/libfdos.a fs/jffs2/libjffs2.a \
        fs/reiserfs/libreiserfs.a fs/ext2/libext2fs.a
@@@ -223,6 -220,7 +223,6 @@@ LIBS += $(shell if [ -d post/board/$(BO
        "post/board/$(BOARDDIR)/libpost$(BOARD).a"; fi)
  LIBS += common/libcommon.a
  LIBS += libfdt/libfdt.a
 -LIBS += $(BOARDLIBS)
  
  LIBS := $(addprefix $(obj),$(LIBS))
  .PHONY : $(LIBS)
@@@ -1732,12 -1730,18 +1732,18 @@@ MPC8560ADS_config:   unconfi
  MPC8541CDS_config:    unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8541cds cds
  
+ MPC8544DS_config:     unconfig
+       @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8544ds freescale
+ 
  MPC8548CDS_config:    unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8548cds cds
  
  MPC8555CDS_config:    unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8555cds cds
  
+ MPC8568MDS_config:    unconfig
+       @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8568mds
+ 
  PM854_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc85xx pm854
  
@@@ -1773,9 -1777,6 +1779,9 @@@ sbc8560_66_config:      unconfi
  stxgp3_config:                unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc85xx stxgp3
  
 +stxssa_config:                unconfig
 +      @$(MKCONFIG) $(@:_config=) ppc mpc85xx stxssa
 +
  TQM8540_config                \
  TQM8541_config                \
  TQM8555_config                \