Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Wed, 9 Feb 2011 19:50:26 +0000 (20:50 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 9 Feb 2011 19:50:26 +0000 (20:50 +0100)
1  2 
MAINTAINERS
boards.cfg

diff --combined MAINTAINERS
index 5a5b9bd103932f37f7bfe593a56d89b4c6a3e56f,54d075b23f3c0a12f28d1d78611ff5065c440d94..07541bd6a1d374d2ea34c78efc6abb5cd3bd5eda
@@@ -146,6 -146,7 +146,7 @@@ Dirk Eibach <eibach@gdsys.de
  
        devconcenter    PPC460EX
        dlvision        PPC405EP
+       dlvision-10g    PPC405EP
        gdppc440etx     PPC440EP/GR
        intip           PPC460EX
        io              PPC405EP
@@@ -1036,7 -1037,6 +1037,7 @@@ Mark Jonas <mark.jonas@de.bosch.com
  Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
  
        MS7720SE        SH7720
 +      R0P77570030RL   SH7757
        R0P77850011RL   SH7785
  
  #########################################################################
diff --combined boards.cfg
index c977528b1d02701077f3f83faae69df93374fdb4,bce35211f1a7b510c12b14cd571392b3ecdcd738..59d4a41f24eba0771578cc9eb8caf1553564836f
@@@ -717,6 -717,7 +717,7 @@@ VOM405                       powerp
  WUH405                       powerpc     ppc4xx      wuh405              esd
  devconcenter                 powerpc     ppc4xx      intip               gdsys          -           intip:DEVCONCENTER
  dlvision                     powerpc     ppc4xx      -                   gdsys
+ dlvision-10g                 powerpc     ppc4xx      405ep               gdsys
  gdppc440etx                  powerpc     ppc4xx      -                   gdsys
  intip                        powerpc     ppc4xx      intip               gdsys          -           intip:INTIB
  io                           powerpc     ppc4xx      405ep               gdsys
@@@ -750,7 -751,6 +751,7 @@@ ms7750se                     s
  ap325rxa                     sh          sh4         ap325rxa            renesas        -
  r2dplus                      sh          sh4         r2dplus             renesas        -
  r7780mp                      sh          sh4         r7780mp             renesas        -
 +sh7757lcr                    sh          sh4         sh7757lcr           renesas        -
  sh7763rdp                    sh          sh4         sh7763rdp           renesas        -
  sh7785lcr                    sh          sh4         sh7785lcr           renesas        -
  sh7785lcr_32bit              sh          sh4         sh7785lcr           renesas        -           sh7785lcr:SH_32BIT=1