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

* 'master' of git://git.denx.de/u-boot-ppc4xx:
  ppc4xx: Add Io64 board support
  ppc4xx: fix PMC440 painit command
  ppc4xx: remove invalid access to PCI_BRDGOPT2 register
  ppc4xx: use CONFIG_PCI_BOOTDELAY instead of private implementation

diff --combined MAINTAINERS
index 045665876d37be423e6cd589375eb7ba1128a24d,7c219815ea7aa81b86b08dd72e1fc6902cc799ae..ad1b62f28ac8a449dcbb528d921a559b38a82247
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -150,6 -150,7 +150,7 @@@ Dirk Eibach <eibach@gdsys.de
        gdppc440etx     PPC440EP/GR
        intip           PPC460EX
        io              PPC405EP
+       io64            PPC405EX
        iocon           PPC405EP
        neo             PPC405EP
  
@@@ -450,10 -451,6 +451,10 @@@ Jon Smirl <jonsmirl@gmail.com
  
        pcm030          MPC5200
  
 +Ira W. Snyder <iws@ovro.caltech.edu>
 +
 +      P2020COME       P2020
 +
  Timur Tabi <timur@freescale.com>
  
        MPC8349E-mITX   MPC8349

diff --combined boards.cfg
index 84cf6b2b368656f4015cdcf503c306976115ef89,d13c47ae1dfa56cb109916cf88c381ede06d64d7..67b2d59358f4940035665538d2d7dc54716da2b5
--- 1/boards.cfg
--- 2/boards.cfg
+++ b/boards.cfg
@@@ -717,8 -717,6 +717,8 @@@ P2020RDB-PC_36BIT            powerp
  P2020RDB-PC_36BIT_NAND       powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P2020RDB,36BIT,NAND
  P2020RDB-PC_36BIT_SDCARD     powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P2020RDB,36BIT,SDCARD
  P2020RDB-PC_36BIT_SPIFLASH   powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P2020RDB,36BIT,SPIFLASH
 +P2020COME_SDCARD             powerpc     mpc85xx     p2020come           freescale      -           P2020COME:SDCARD
 +P2020COME_SPIFLASH           powerpc     mpc85xx     p2020come           freescale      -           P2020COME:SPIFLASH
  P2041RDB                     powerpc     mpc85xx     p2041rdb            freescale
  P2041RDB_SDCARD              powerpc     mpc85xx     p2041rdb            freescale      -           P2041RDB:RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF80000
  P2041RDB_SECURE_BOOT         powerpc     mpc85xx     p2041rdb            freescale      -           P2041RDB:SECURE_BOOT
@@@ -728,9 -726,6 +728,9 @@@ P3041DS_NAND                    powerpc     mpc85x
  P3041DS_SDCARD                     powerpc     mpc85xx     corenet_ds          freescale      -           P3041DS:RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF80000
  P3041DS_SECURE_BOOT          powerpc     mpc85xx     corenet_ds          freescale      -           P3041DS:SECURE_BOOT
  P3041DS_SPIFLASH           powerpc     mpc85xx     corenet_ds          freescale      -           P3041DS:RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF80000
 +P3060QDS                   powerpc     mpc85xx     p3060qds            freescale
 +P3060QDS_NAND              powerpc     mpc85xx     p3060qds            freescale      -           P3060QDS:RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF80000
 +P3060QDS_SECURE_BOOT         powerpc     mpc85xx     p3060qds            freescale      -           P3060QDS:SECURE_BOOT
  P4080DS                      powerpc     mpc85xx     corenet_ds          freescale
  P4080DS_SDCARD                     powerpc     mpc85xx     corenet_ds          freescale      -           P4080DS:RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF80000
  P4080DS_SECURE_BOOT          powerpc     mpc85xx     corenet_ds          freescale      -           P4080DS:SECURE_BOOT
@@@ -959,6 -954,7 +959,7 @@@ dlvision-10g                 powerp
  gdppc440etx                  powerpc     ppc4xx      -                   gdsys
  intip                        powerpc     ppc4xx      intip               gdsys          -           intip:INTIB
  io                           powerpc     ppc4xx      405ep               gdsys
+ io64                         powerpc     ppc4xx      405ex               gdsys
  iocon                        powerpc     ppc4xx      405ep               gdsys
  neo                          powerpc     ppc4xx      -                   gdsys
  icon                         powerpc     ppc4xx      -                   mosaixtech