Merge branch 'next'

diff --combined Makefile
index e141cb2,c0e73de..4532550
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,5 -1,5 +1,5 @@@
  #
- # (C) Copyright 2000-2009
+ # (C) Copyright 2000-2010
  # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  #
  # See file CREDITS for list of people who contributed to this
@@@ -24,7 -24,7 +24,7 @@@
  VERSION = 2010
  PATCHLEVEL = 03
  SUBLEVEL =
 -EXTRAVERSION = -rc3
 +EXTRAVERSION =
  ifneq "$(SUBLEVEL)" ""
  U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
  else
@@@ -548,8 -548,7 +548,7 @@@ icecube_5200_LOWBOOT_config                
  icecube_5200_LOWBOOT08_config         \
  icecube_5200_DDR_config                       \
  icecube_5200_DDR_LOWBOOT_config               \
- icecube_5200_DDR_LOWBOOT08_config     \
- icecube_5100_config:                  unconfig
+ icecube_5200_DDR_LOWBOOT08_config:    unconfig
        @mkdir -p $(obj)include
        @mkdir -p $(obj)board/icecube
        @[ -z "$(findstring LOWBOOT_,$@)" ] || \
@@@ -568,14 -567,6 +567,6 @@@
                { echo "#define CONFIG_MPC5200_DDR"     >>$(obj)include/config.h ; \
                  $(XECHO) "... DDR memory revision" ; \
                }
-       @[ -z "$(findstring 5200,$@)" ] || \
-               { echo "#define CONFIG_MPC5200"         >>$(obj)include/config.h ; \
-                 $(XECHO) "... with MPC5200 processor" ; \
-               }
-       @[ -z "$(findstring 5100,$@)" ] || \
-               { echo "#define CONFIG_MGT5100"         >>$(obj)include/config.h ; \
-                 $(XECHO) "... with MGT5100 processor" ; \
-               }
        @$(MKCONFIG) -a IceCube ppc mpc5xxx icecube
  
  jupiter_config:       unconfig
@@@ -594,7 -585,6 +585,6 @@@ lite5200b_LOWBOOT_config:  unconfi
        @mkdir -p $(obj)board/icecube
        @ echo "#define CONFIG_MPC5200_DDR"     >>$(obj)include/config.h
        @ $(XECHO) "... DDR memory revision"
-       @ echo "#define CONFIG_MPC5200"         >>$(obj)include/config.h
        @ echo "#define CONFIG_LITE5200B"       >>$(obj)include/config.h
        @[ -z "$(findstring _PM_,$@)" ] || \
                { echo "#define CONFIG_LITE5200B_PM"    >>$(obj)include/config.h ; \
@@@ -604,7 -594,6 +594,6 @@@
                { echo "TEXT_BASE = 0xFF000000" >$(obj)board/icecube/config.tmp ; \
                  $(XECHO) "... with LOWBOOT configuration" ; \
                }
-       @ $(XECHO) "... with MPC5200B processor"
        @$(MKCONFIG) -a IceCube  ppc mpc5xxx icecube
  
  mcc200_config \
@@@ -728,21 -717,12 +717,12 @@@ TOP5200_config: unconfi
        @ echo "#define CONFIG_$(@:_config=) 1" >$(obj)include/config.h
        @$(MKCONFIG) -n $@ -a TOP5200 ppc mpc5xxx top5200 emk
  
- Total5100_config              \
  Total5200_config              \
  Total5200_lowboot_config      \
  Total5200_Rev2_config         \
  Total5200_Rev2_lowboot_config:        unconfig
        @mkdir -p $(obj)include
        @mkdir -p $(obj)board/total5200
-       @[ -z "$(findstring 5100,$@)" ] || \
-               { echo "#define CONFIG_MGT5100"         >>$(obj)include/config.h ; \
-                 $(XECHO) "... with MGT5100 processor" ; \
-               }
-       @[ -z "$(findstring 5200,$@)" ] || \
-               { echo "#define CONFIG_MPC5200"         >>$(obj)include/config.h ; \
-                 $(XECHO) "... with MPC5200 processor" ; \
-               }
        @[ -n "$(findstring Rev,$@)" ] || \
                { echo "#define CONFIG_TOTAL5200_REV 1" >>$(obj)include/config.h ; \
                  $(XECHO) "... revision 1 board" ; \
@@@ -1993,6 -1973,10 +1973,10 @@@ ZPC1900_config: unconfi
  ## Coldfire
  #########################################################################
  
+ astro_mcf5373l_config \
+ astro_mcf5373l_RAM_config :   unconfig
+       @$(MKCONFIG) -t $(@:_config=) astro_mcf5373l m68k mcf532x mcf5373l astro
+ 
  M5208EVBE_config :            unconfig
        @$(MKCONFIG) $(@:_config=) m68k mcf52x2 m5208evbe freescale
  
@@@ -2061,6 -2045,9 +2045,9 @@@ EB+MCF-EV123_internal_config :  unconfi
        @echo "TEXT_BASE = 0xF0000000"|tee $(obj)board/BuS/EB+MCF-EV123/textbase.mk
        @$(MKCONFIG) EB+MCF-EV123 m68k mcf52x2 EB+MCF-EV123 BuS
  
+ EP2500_config:                        unconfig
+       @$(MKCONFIG) $(@:_config=) m68k mcf52x2 ep2500 Mercury
+ 
  idmr_config :                 unconfig
        @$(MKCONFIG) $(@:_config=) m68k mcf52x2 idmr
  

diff --combined common/cmd_bootm.c
index 995e378,827d542..452686d
--- 1/common/cmd_bootm.c
--- 2/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@@ -291,8 -291,7 +291,8 @@@ static int bootm_start(cmd_tbl_t *cmdtp
                return 1;
        }
  
 -      if ((images.os.type == IH_TYPE_KERNEL) &&
 +      if (((images.os.type == IH_TYPE_KERNEL) ||
 +           (images.os.type == IH_TYPE_MULTI)) &&
            (images.os.os == IH_OS_LINUX)) {
                /* find ramdisk */
                ret = boot_get_ramdisk (argc, argv, &images, IH_INITRD_ARCH,
@@@ -463,7 -462,7 +463,7 @@@ static int bootm_start_standalone(ulon
  
  /* we overload the cmd field with our state machine info instead of a
   * function pointer */
- cmd_tbl_t cmd_bootm_sub[] = {
+ static cmd_tbl_t cmd_bootm_sub[] = {
        U_BOOT_CMD_MKENT(start, 0, 1, (void *)BOOTM_STATE_START, "", ""),
        U_BOOT_CMD_MKENT(loados, 0, 1, (void *)BOOTM_STATE_LOADOS, "", ""),
  #if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_SPARC)