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

diff --combined MAINTAINERS
index 24f754cced3fd2d77de61f2344ddef3156532bd6,f8aa8847e6990c1a1c9d188ccd1b181d67e133dc..f10e9241d473e20f93a198aab20fa0325a16ed08
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -354,10 -354,6 +354,10 @@@ Daniel Poirot <dan.poirot@windriver.com
        sbc8240         MPC8240
        sbc405          PPC405GP
  
 +Sudhakar Rajashekhara <sudhakar.raj@ti.com>
 +
 +      da850evm        ARM926EJS (DA850/OMAP-L138)
 +
  Ricardo Ribalda <ricardo.ribalda@uam.es>
  
        ml507           PPC440x5
@@@ -534,6 -530,10 +534,10 @@@ Unknown / orphaned boards
  #     Board           CPU                                             #
  #########################################################################
  
+ Albert ARIBAUD <albert.aribaud@free.fr>
+ 
+       edminiv2        ARM926EJS (Orion5x SoC)
+ 
  Rowel Atienza <rowel@diwalabs.com>
  
        armadillo       ARM720T
@@@ -856,6 -856,22 +860,6 @@@ Stefan Roese <sr@denx.de
        vct_xxx         MIPS32 4Kc
  
  #########################################################################
 -# Nios-32 Systems:                                                    #
 -#                                                                     #
 -# Maintainer Name, Email Address                                      #
 -#     Board           CPU                                             #
 -#########################################################################
 -
 -Stephan Linz <linz@li-pro.net>
 -
 -      DK1S10          Nios-32
 -      ADNPESC1        Nios-32
 -
 -Scott McNutt <smcnutt@psyent.com>
 -
 -      DK1C20          Nios-32
 -
 -#########################################################################
  # Nios-II Systems:                                                    #
  #                                                                     #
  # Maintainer Name, Email Address                                      #

diff --combined MAKEALL
index 170bcad3a41f0f97fb254e9305bd53d299c9a831,5de17c5669a76c88126391f55be98c7de544fc0d..d6d5f5b4236cdb080fe8257454705cddcbe5419c
--- 1/MAKEALL
--- 2/MAKEALL
+++ b/MAKEALL
@@@ -561,7 -561,6 +561,7 @@@ LIST_ARM9="                        
        cp946es                 \
        cp966                   \
        da830evm                \
 +      da850evm                \
        edb9301                 \
        edb9302                 \
        edb9302a                \
@@@ -570,6 -569,7 +570,7 @@@
        edb9312                 \
        edb9315                 \
        edb9315a                \
+       edminiv2                \
        guruplug                \
        imx27lite               \
        lpd7a400                \
@@@ -815,6 -815,21 +816,6 @@@ LIST_x86="                
        ${LIST_I486}    \
  "
  
 -#########################################################################
 -## NIOS Systems
 -#########################################################################
 -
 -LIST_nios="                   \
 -      ADNPESC1                \
 -      ADNPESC1_base_32        \
 -      ADNPESC1_DNPEVA2_base_32\
 -      DK1C20                  \
 -      DK1C20_standard_32      \
 -      DK1S10                  \
 -      DK1S10_standard_32      \
 -      DK1S10_mtx_ldk_20       \
 -"
 -
  #########################################################################
  ## Nios-II Systems
  #########################################################################
@@@ -1007,7 -1022,7 +1008,7 @@@ d
        |coldfire \
        |microblaze \
        |mips|mips_el \
 -      |nios|nios2 \
 +      |nios2 \
        |ppc|powerpc|5xx|5xxx|512x|8xx|8220|824x|8260|83xx|85xx|86xx|4xx|7xx|74xx|TSEC \
        |sh|sh2|sh3|sh4 \
        |sparc \

diff --combined Makefile
index 8d28460ec2012f47a65fe760f488e07ab75924a6,a4698d8b322bb1a3d0e6f89705592794f9f52d80..55bb9646e77bf8a4c9af1488679a8bd14bc46022
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -24,7 -24,7 +24,7 @@@
  VERSION = 2010
  PATCHLEVEL = 06
  SUBLEVEL =
 -EXTRAVERSION = -rc1
 +EXTRAVERSION = -rc2
  ifneq "$(SUBLEVEL)" ""
  U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
  else
@@@ -2920,9 -2920,8 +2920,9 @@@ cp922_XA10_config       
  cp1026_config: unconfig
        @board/armltd/integrator/split_by_variant.sh cp $@
  
 -da830evm_config:      unconfig
 -      @$(MKCONFIG) $(@:_config=) arm arm926ejs da830evm davinci davinci
 +da830evm_config               \
 +da850evm_config:      unconfig
 +      @$(MKCONFIG) $(@:_config=) arm arm926ejs da8xxevm davinci davinci
  
  davinci_dvevm_config :        unconfig
        @$(MKCONFIG) $(@:_config=) arm arm926ejs dvevm davinci davinci
@@@ -2948,6 -2947,9 +2948,9 @@@ davinci_dm365evm_config :       unconfi
  davinci_dm6467evm_config :    unconfig
        @$(MKCONFIG) $(@:_config=) arm arm926ejs dm6467evm davinci davinci
  
+ edminiv2_config: unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm926ejs $(@:_config=) LaCie orion5x
+ 
  guruplug_config: unconfig
        @$(MKCONFIG) $(@:_config=) arm arm926ejs $(@:_config=) Marvell kirkwood
  
@@@ -3476,6 -3478,68 +3479,6 @@@ purple_config :                unconfi
  #========================================================================
  # Nios
  #========================================================================
 -#########################################################################
 -## Nios32
 -#########################################################################
 -
 -ADNPESC1_DNPEVA2_base_32_config       \
 -ADNPESC1_base_32_config               \
 -ADNPESC1_config: unconfig
 -      @mkdir -p $(obj)include
 -      @[ -z "$(findstring _DNPEVA2,$@)" ] || \
 -              { echo "#define CONFIG_DNPEVA2 1" >>$(obj)include/config.h ; \
 -                $(XECHO) "... DNP/EVA2 configuration" ; \
 -              }
 -      @[ -z "$(findstring _base_32,$@)" ] || \
 -              { echo "#define CONFIG_NIOS_BASE_32 1" >>$(obj)include/config.h ; \
 -                $(XECHO) "... NIOS 'base_32' configuration" ; \
 -              }
 -      @[ -z "$(findstring ADNPESC1_config,$@)" ] || \
 -              { echo "#define CONFIG_NIOS_BASE_32 1" >>$(obj)include/config.h ; \
 -                $(XECHO) "... NIOS 'base_32' configuration (DEFAULT)" ; \
 -              }
 -      @$(MKCONFIG) -a ADNPESC1 nios nios adnpesc1 ssv
 -
 -DK1C20_safe_32_config         \
 -DK1C20_standard_32_config     \
 -DK1C20_config:        unconfig
 -      @mkdir -p $(obj)include
 -      @[ -z "$(findstring _safe_32,$@)" ] || \
 -              { echo "#define CONFIG_NIOS_SAFE_32 1" >>$(obj)include/config.h ; \
 -                $(XECHO) "... NIOS 'safe_32' configuration" ; \
 -              }
 -      @[ -z "$(findstring _standard_32,$@)" ] || \
 -              { echo "#define CONFIG_NIOS_STANDARD_32 1" >>$(obj)include/config.h ; \
 -                $(XECHO) "... NIOS 'standard_32' configuration" ; \
 -              }
 -      @[ -z "$(findstring DK1C20_config,$@)" ] || \
 -              { echo "#define CONFIG_NIOS_STANDARD_32 1" >>$(obj)include/config.h ; \
 -                $(XECHO) "... NIOS 'standard_32' configuration (DEFAULT)" ; \
 -              }
 -      @$(MKCONFIG) -a DK1C20 nios nios dk1c20 altera
 -
 -DK1S10_safe_32_config         \
 -DK1S10_standard_32_config     \
 -DK1S10_mtx_ldk_20_config      \
 -DK1S10_config:        unconfig
 -      @mkdir -p $(obj)include
 -      @[ -z "$(findstring _safe_32,$@)" ] || \
 -              { echo "#define CONFIG_NIOS_SAFE_32 1" >>$(obj)include/config.h ; \
 -                $(XECHO) "... NIOS 'safe_32' configuration" ; \
 -              }
 -      @[ -z "$(findstring _standard_32,$@)" ] || \
 -              { echo "#define CONFIG_NIOS_STANDARD_32 1" >>$(obj)include/config.h ; \
 -                $(XECHO) "... NIOS 'standard_32' configuration" ; \
 -              }
 -      @[ -z "$(findstring _mtx_ldk_20,$@)" ] || \
 -              { echo "#define CONFIG_NIOS_MTX_LDK_20 1" >>$(obj)include/config.h ; \
 -                $(XECHO) "... NIOS 'mtx_ldk_20' configuration" ; \
 -              }
 -      @[ -z "$(findstring DK1S10_config,$@)" ] || \
 -              { echo "#define CONFIG_NIOS_STANDARD_32 1" >>$(obj)include/config.h ; \
 -                $(XECHO) "... NIOS 'standard_32' configuration (DEFAULT)" ; \
 -              }
 -      @$(MKCONFIG) -a DK1S10 nios nios dk1s10 altera
  
  #########################################################################
  ## Nios-II