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

diff --combined MAINTAINERS
index d9ffebf69ef0e6f1dcba460a0d670bea8e836604,b537f0197f01eda29a7ea43000262ec6d282618b..31c0311312765d9223bdc477eebe8ba775eb9f47
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -322,7 -322,6 +322,7 @@@ Stefan Roese <sr@denx.de
        bunbinga                PPC405EP
        canyonlands             PPC460EX
        ebony                   PPC440GP
 +      glacier                 PPC460GT
        haleakala               PPC405EXr
        katmai                  PPC440SPe
        kilauea                 PPC405EX
@@@ -695,15 -694,25 +695,25 @@@ Haavard Skinnemoen <hskinnemoen@atmel.c
  #     Board                   CPU                                     #
  #########################################################################
  
- Nobuhiro Iwmaatsu <iwamatsu@nigauri.org>
+ Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
  
        MS7750SE                SH7750
        MS7722SE                SH7722
+       R7780MP                 SH7780
+       R2DPlus                 SH7751R
+ 
+ Mark Jonas <mark.jonas@de.bosch.com>
+ 
+       mpr2                    SH7720
  
  Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
  
        MS7720SE                SH7720
  
+ Yusuke Goda <goda.yusuke@renesas.com>
+ 
+       MIGO-R                  SH7722
+ 
  #########################################################################
  # Blackfin Systems:                                                   #
  #                                                                     #

diff --combined MAKEALL
index b2ae35b24282619e91843347998ca17f8d134930,756cf876da8bcf6c275eaf414b05f5b8e5c1ad10..c026b05c1a0844ec2b632cd4490780bb08ec5536
--- 1/MAKEALL
--- 2/MAKEALL
+++ b/MAKEALL
@@@ -185,7 -185,6 +185,7 @@@ LIST_4xx="         
        ERIC            \
        EXBITGEN        \
        G2000           \
 +      glacier         \
        haleakala       \
        haleakala_nand  \
        hcu4            \
@@@ -700,9 -699,13 +700,13 @@@ LIST_blackfin="          
  LIST_sh4="            \
        ms7750se        \
        ms7722se        \
+       Migo-R          \
+       r7780mp         \
+       r2dplus         \
  "
  
  LIST_sh3="            \
+       mpr2            \
        ms7720se        \
  "
  

diff --combined Makefile
index 744abae04d820f116207e34e07f76d14b78922b1,420c684da4943f98c8602769c494b4586d90070c..890c0972fe29a0d3f008288ff030da535e3867f5
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1172,13 -1172,8 +1172,13 @@@ bubinga_config:       unconfi
  CANBT_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx canbt esd
  
 -canyonlands_config:   unconfig
 -      @$(MKCONFIG) $(@:_config=) ppc ppc4xx canyonlands amcc
 +# Canyonlands & Glacier use different U-Boot images
 +canyonlands_config \
 +glacier_config:       unconfig
 +      @mkdir -p $(obj)include
 +      @echo "#define CONFIG_$$(echo $(subst ,,$(@:_config=)) | \
 +              tr '[:lower:]' '[:upper:]')" >$(obj)include/config.h
 +      @$(MKCONFIG) -n $@ -a canyonlands ppc ppc4xx canyonlands amcc
  
  canyonlands_nand_config:      unconfig
        @mkdir -p $(obj)include $(obj)board/amcc/canyonlands
@@@ -2842,6 -2837,11 +2842,11 @@@ atngw100_config       :       unconfi
  #########################################################################
  ## sh3 (Renesas SuperH)
  #########################################################################
+ mpr2_config: unconfig
+       @ >include/config.h
+       @echo "#define CONFIG_MPR2 1" >> include/config.h
+       @$(MKCONFIG) -a $(@:_config=) sh sh3 mpr2
+ 
  ms7720se_config: unconfig
        @echo "#define CONFIG_MS7720SE 1" > include/config.h
        @$(MKCONFIG) -a $(@:_config=) sh sh3 ms7720se
@@@ -2857,6 -2857,21 +2862,21 @@@ ms7722se_config :     unconfi
        @echo "#define CONFIG_MS7722SE 1" > $(obj)include/config.h
        @$(MKCONFIG) -a $(@:_config=) sh sh4 ms7722se
  
+ MigoR_config :       unconfig
+       @ >include/config.h
+       @echo "#define CONFIG_MIGO_R 1" >> include/config.h
+       @./mkconfig -a $(@:_config=) sh sh4 MigoR
+ 
+ r7780mp_config: unconfig
+       @ >include/config.h
+       @echo "#define CONFIG_R7780MP 1" >> include/config.h
+       @./mkconfig -a $(@:_config=) sh sh4 r7780mp
+ 
+ r2dplus_config  :   unconfig
+       @ >include/config.h
+       @echo "#define CONFIG_R2DPLUS 1" >> include/config.h
+       @./mkconfig -a $(@:_config=) sh sh4 r2dplus
+ 
  #########################################################################
  #########################################################################
  #########################################################################