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

diff --combined boards.cfg
index 6c86d4206785eb2b7cba34e9037c50d512b9cf4c,cbfba73c33ff95dfa6bb45ed82bdd0e6a1877c68..a5af63c1ba3f063e4c503f306818ef30f8642d68
--- 1/boards.cfg
--- 2/boards.cfg
+++ b/boards.cfg
@@@ -404,6 -404,8 +404,8 @@@ M5485HFE                m68k        mcf547x_8x  
  microblaze-generic           microblaze  microblaze  microblaze-generic  xilinx
  qemu_mips                    mips        mips32      qemu-mips           -              -           qemu-mips:SYS_BIG_ENDIAN
  qemu_mipsel                  mips        mips32      qemu-mips           -              -           qemu-mips:SYS_LITTLE_ENDIAN
+ qemu_mips64                  mips        mips64      qemu-mips           -              -           qemu-mips64:SYS_BIG_ENDIAN
+ qemu_mips64el                mips        mips64      qemu-mips           -              -           qemu-mips64:SYS_LITTLE_ENDIAN
  vct_platinum                 mips        mips32      vct                 micronas       -           vct:VCT_PLATINUM
  vct_platinumavc              mips        mips32      vct                 micronas       -           vct:VCT_PLATINUMAVC
  vct_platinumavc_onenand      mips        mips32      vct                 micronas       -           vct:VCT_PLATINUMAVC,VCT_ONENAND
@@@ -544,6 -546,7 +546,6 @@@ Alaska8220                   powerp
  sorcery                      powerpc     mpc8220
  Yukon8220                    powerpc     mpc8220     alaska
  A3000                        powerpc     mpc824x     a3000
 -BMW                          powerpc     mpc824x     bmw
  CPC45                        powerpc     mpc824x     cpc45               -              -           CPC45
  CPC45_ROMBOOT                powerpc     mpc824x     cpc45               -              -           CPC45:BOOT_ROM
  CU824                        powerpc     mpc824x     cu824