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

diff --combined boards.cfg
index b7017374753d4a9446a2e2beb47800baee066239,e8afdb13be3be972269e6801e9b226910e9f8db2..f9691c792874df350ccbb1c06c7b5f577de4a50d
--- 1/boards.cfg
--- 2/boards.cfg
+++ b/boards.cfg
@@@ -556,8 -556,9 +556,9 @@@ MPC8540ADS powerpc mpc85xx         mpc8540ads      
  MPC8544DS     powerpc mpc85xx         mpc8544ds       freescale
  MPC8560ADS    powerpc mpc85xx         mpc8560ads      freescale
  MPC8568MDS    powerpc mpc85xx         mpc8568mds      freescale
- XPEDITE5200   powerpc mpc85xx         xpedite5200     xes
- XPEDITE5370   powerpc mpc85xx         xpedite5370     xes
+ xpedite520x   powerpc mpc85xx         -               xes
+ xpedite537x   powerpc mpc85xx         -               xes
+ xpedite550x   powerpc mpc85xx         -               xes
  sbc8540_33    powerpc mpc85xx         sbc8560         -               -       SBC8540
  sbc8540_66    powerpc mpc85xx         sbc8560         -               -       SBC8540
  sbc8548_PCI_33        powerpc mpc85xx         sbc8548         -               -       sbc8548:PCI,33
@@@ -597,7 -598,7 +598,7 @@@ P2020RDB_NAND      powerpc mpc85xx         p1_p2_rd
  P2020RDB_SDCARD       powerpc mpc85xx         p1_p2_rdb       freescale       -       P1_P2_RDB:P2020,SDCARD
  sbc8641d      powerpc mpc86xx
  MPC8610HPCD   powerpc mpc86xx         mpc8610hpcd     freescale
- XPEDITE5170   powerpc mpc86xx         xpedite5170     xes
+ xpedite517x   powerpc mpc86xx         -               xes
  MPC8641HPCN   powerpc mpc86xx         mpc8641hpcn     freescale       -       MPC8641HPCN
  cogent_mpc8xx powerpc mpc8xx          cogent
  ESTEEM192E    powerpc mpc8xx          esteem192e
@@@ -648,7 -649,7 +649,7 @@@ CPCIISER4  powerpc ppc4xx          cpciiser4       es
  DASA_SIM      powerpc ppc4xx          dasa_sim        esd
  PMC405DE      powerpc ppc4xx          pmc405de        esd
  METROBOX      powerpc ppc4xx          metrobox        sandburst
- XPEDITE1000   powerpc ppc4xx          xpedite1000     xes
+ xpedite1000   powerpc ppc4xx          -               xes
  korat_perm    powerpc ppc4xx          korat           -               -       korat:KORAT_PERMANENT
  haleakala     powerpc ppc4xx          kilauea         amcc            -       kilauea:HALEAKALA
  sycamore      powerpc ppc4xx          walnut          amcc            -       walnut
@@@ -732,18 -733,5 +733,18 @@@ davinci_dm6467evm arm    arm926ejs       dm6467e
  davinci_schmoogie arm arm926ejs       schmoogie       davinci         davinci
  davinci_dm355leopard arm arm926ejs    dm355leopard    davinci         davinci
  bf527-ad7160-eval blackfin    blackfin
 +rsk7203       sh      sh2             rsk7203         renesas         -
 +mpr2  sh      sh3             mpr2    -       -
 +ms7720se      sh      sh3     ms7720se        -       -
 +MigoRsh       sh4     MigoR   renesas -   
 +ms7750se      sh      sh4     ms7750se        -       -   
 +ms7722se      sh      sh4     ms7722se        -       -   
 +r2dplus       sh      sh4     r2dplus renesas -   
 +r7780mp       sh      sh4     r7780mp renesas -   
 +sh7763rdp     sh      sh4     sh7763rdp       renesas -   
 +sh7785lcr     sh      sh4     sh7785lcr       renesas -   
 +sh7785lcr_32bit       sh  sh4 sh7785lcr       renesas -       sh7785lcr:SH_32BIT=1
 +ap325rxa      sh      sh4     ap325rxa        renesas -   
 +espt  sh      sh4     espt    -       -
  # Target      ARCH    CPU             Board name      Vendor          SoC             Options
  ###############################################################################################