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

diff --combined Makefile
index 28bad6c,3969e07..d5e220a
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -173,9 -173,6 +173,6 @@@ endi
  ifeq ($(CPU),mpc85xx)
  OBJS += cpu/$(CPU)/resetvec.o
  endif
- ifeq ($(CPU),mpc86xx)
- OBJS += cpu/$(CPU)/resetvec.o
- endif
  ifeq ($(CPU),bf533)
  OBJS += cpu/$(CPU)/start1.o   cpu/$(CPU)/interrupt.o  cpu/$(CPU)/cache.o
  OBJS += cpu/$(CPU)/flush.o    cpu/$(CPU)/init_sdram.o
@@@ -1017,15 -1014,6 +1014,15 @@@ xtract_4xx = $(subst _25,,$(subst _33,,
  acadia_config:        unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx acadia amcc
  
 +acadia_nand_config:   unconfig
 +      @mkdir -p $(obj)include
 +      @mkdir -p $(obj)nand_spl
 +      @mkdir -p $(obj)board/amcc/acadia
 +      @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
 +      @$(MKCONFIG) -n $@ -a acadia ppc ppc4xx acadia amcc
 +      @echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/acadia/config.tmp
 +      @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
 +
  ADCIOP_config:        unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx adciop esd
  
@@@ -1047,15 -1035,6 +1044,15 @@@ ASH405_config:        unconfi
  bamboo_config:        unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx bamboo amcc
  
 +bamboo_nand_config:   unconfig
 +      @mkdir -p $(obj)include
 +      @mkdir -p $(obj)nand_spl
 +      @mkdir -p $(obj)board/amcc/bamboo
 +      @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
 +      @$(MKCONFIG) -n $@ -a bamboo ppc ppc4xx bamboo amcc
 +      @echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/bamboo/config.tmp
 +      @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
 +
  bubinga_config:       unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx bubinga amcc
  
@@@ -1644,19 -1623,6 +1641,19 @@@ r5200_config :                unconfi
  ## MPC83xx Systems
  #########################################################################
  
 +MPC8313ERDB_33_config \
 +MPC8313ERDB_66_config: unconfig
 +      @echo "" >include/config.h ; \
 +      if [ "$(findstring _33_,$@)" ] ; then \
 +              echo -n "...33M ..." ; \
 +              echo "#define CFG_33MHZ" >>include/config.h ; \
 +      fi ; \
 +      if [ "$(findstring _66_,$@)" ] ; then \
 +              echo -n "...66M..." ; \
 +              echo "#define CFG_66MHZ" >>include/config.h ; \
 +      fi ;
 +      @$(MKCONFIG) -a MPC8313ERDB ppc mpc83xx mpc8313erdb
 +
  MPC832XEMDS_config \
  MPC832XEMDS_HOST_33_config \
  MPC832XEMDS_HOST_66_config \
@@@ -1810,16 -1776,8 +1807,16 @@@ sbc8560_66_config:      unconfi
  stxgp3_config:                unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc85xx stxgp3
  
 -stxssa_config:                unconfig
 -      @$(MKCONFIG) $(@:_config=) ppc mpc85xx stxssa
 +stxssa_config         \
 +stxssa_4M_config:     unconfig
 +      @mkdir -p $(obj)include
 +      @if [ "$(findstring _4M_,$@)" ] ; then \
 +              echo "#define CONFIG_STXSSA_4M" >>$(obj)include/config.h ; \
 +              echo "... with 4 MiB flash memory" ; \
 +      else \
 +              >$(obj)include/config.h ; \
 +      fi
 +      @$(MKCONFIG) -a stxssa ppc mpc85xx stxssa
  
  TQM8540_config                \
  TQM8541_config                \
@@@ -2139,10 -2097,7 +2136,10 @@@ evb4510_config :      unconfi
        @$(MKCONFIG) $(@:_config=) arm arm720t evb4510
  
  lpc2292sodimm_config: unconfig
 -      @$(MKCONFIG) $(@:_config=) arm arm720t lpc2292sodimm
 +      @$(MKCONFIG) $(@:_config=) arm arm720t lpc2292sodimm NULL lpc2292
 +
 +SMN42_config  :       unconfig
 +      @$(MKCONFIG) $(@:_config=) arm arm720t SMN42 siemens lpc2292
  
  #########################################################################
  ## XScale Systems