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

diff --combined MAKEALL
index 29faaa5,49d5d2f..530fe82
--- 1/MAKEALL
--- 2/MAKEALL
+++ b/MAKEALL
@@@ -335,7 -335,6 +335,7 @@@ LIST_8260="                
  #########################################################################
  
  LIST_83xx="           \
 +      kmeter1         \
        MPC8313ERDB_33  \
        MPC8313ERDB_NAND_66     \
        MPC8315ERDB     \
@@@ -353,7 -352,6 +353,7 @@@
        MPC837XERDB     \
        MVBLM7          \
        sbc8349         \
 +      SIMPC8313_LP    \
        TQM834x         \
  "
  
@@@ -374,6 -372,7 +374,7 @@@ LIST_85xx="                
        MPC8560ADS      \
        MPC8568MDS      \
        MPC8572DS       \
+       MPC8572DS_36BIT \
        PM854           \
        PM856           \
        sbc8540         \
@@@ -660,7 -659,6 +661,7 @@@ LIST_mips_el="                     
  
  LIST_I486="           \
        sc520_cdp       \
 +      sc520_eNET      \
        sc520_spunk     \
        sc520_spunk_rel \
  "

diff --combined Makefile
index 4aeae07,ad79a2a..8c73586
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -197,7 -197,7 +197,7 @@@ include $(TOPDIR)/config.m
  OBJS  = cpu/$(CPU)/start.o
  ifeq ($(CPU),i386)
  OBJS += cpu/$(CPU)/start16.o
 -OBJS += cpu/$(CPU)/reset.o
 +OBJS += cpu/$(CPU)/resetvec.o
  endif
  ifeq ($(CPU),ppc4xx)
  OBJS += cpu/$(CPU)/resetvec.o
@@@ -2186,9 -2186,6 +2186,9 @@@ TASREG_config :         unconfi
  ## MPC83xx Systems
  #########################################################################
  
 +kmeter1_config: unconfig
 +      @$(MKCONFIG) kmeter1 ppc mpc83xx kmeter1 keymile
 +
  MPC8313ERDB_33_config \
  MPC8313ERDB_66_config \
  MPC8313ERDB_NAND_33_config \
@@@ -2328,21 -2325,6 +2328,21 @@@ MVBLM7_config: unconfi
  sbc8349_config:               unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc83xx sbc8349
  
 +SIMPC8313_LP_config \
 +SIMPC8313_SP_config: unconfig
 +      @mkdir -p $(obj)include
 +      @mkdir -p $(obj)board/sheldon/simpc8313
 +      @if [ "$(findstring _LP_,$@)" ] ; then \
 +              $(XECHO) -n "...Large Page NAND..." ; \
 +              echo "#define CONFIG_NAND_LP" >> $(obj)include/config.h ; \
 +      fi ; \
 +      if [ "$(findstring _SP_,$@)" ] ; then \
 +              $(XECHO) -n "...Small Page NAND..." ; \
 +              echo "#define CONFIG_NAND_SP" >> $(obj)include/config.h ; \
 +      fi ;
 +      @$(MKCONFIG) -a SIMPC8313 ppc mpc83xx simpc8313 sheldon
 +      @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
 +
  TQM834x_config:       unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc83xx tqm834x tqc
  
@@@ -2416,8 -2398,14 +2416,14 @@@ MPC8555CDS_config:    unconfi
  MPC8568MDS_config:    unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8568mds freescale
  
+ MPC8572DS_36BIT_config \
  MPC8572DS_config:       unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8572ds freescale
+       @mkdir -p $(obj)include
+       @if [ "$(findstring _36BIT_,$@)" ] ; then \
+               echo "#define CONFIG_PHYS_64BIT" >>$(obj)include/config.h ; \
+               $(XECHO) "... enabling 36-bit physical addressing." ; \
+       fi
+       @$(MKCONFIG) -a MPC8572DS ppc mpc85xx mpc8572ds freescale
  
  PM854_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc85xx pm854
@@@ -3008,17 -2996,14 +3014,17 @@@ smdk6400_config      :       unconfi
  #########################################################################
  ## AMD SC520 CDP
  #########################################################################
 +eNET_config   :       unconfig
 +      @$(MKCONFIG) $(@:_config=) i386 i386 eNET NULL sc520
 +
  sc520_cdp_config      :       unconfig
 -      @$(MKCONFIG) $(@:_config=) i386 i386 sc520_cdp
 +      @$(MKCONFIG) $(@:_config=) i386 i386 sc520_cdp NULL sc520
  
  sc520_spunk_config    :       unconfig
 -      @$(MKCONFIG) $(@:_config=) i386 i386 sc520_spunk
 +      @$(MKCONFIG) $(@:_config=) i386 i386 sc520_spunk NULL sc520
  
  sc520_spunk_rel_config        :       unconfig
 -      @$(MKCONFIG) $(@:_config=) i386 i386 sc520_spunk
 +      @$(MKCONFIG) $(@:_config=) i386 i386 sc520_spunk NULL sc520
  
  #========================================================================
  # MIPS