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

* 'master' of git://git.denx.de/u-boot-ppc4xx:
  powerpc/ppc4xx: Remove typedefs for gdsys FPGA
  powerpc/ppc4xx: Fix typo in gdsys_fpga.h
  powerpc/ppc4xx: Update gdsys board configurations
  powerpc/ppc4xx: Support gdsys dlvision-10g hardware 1.20
  powerpc/ppc4xx: Adapt gdsys 405ep boards to platform changes
  powerpc/ppc4xx: Make gdsys 405ep boards reset more generic
  powerpc/ppc4xx: Adjust environment size on neo

diff --combined boards.cfg
index 15339f7,24c5879..5f328b5
--- 1/boards.cfg
--- 2/boards.cfg
+++ b/boards.cfg
@@@ -370,7 -370,6 +370,7 @@@ incaip_150MHz                mip
  qi_lb60                      mips        xburst      qi_lb60             qi
  adp-ag101                    nds32       n1213       adp-ag101           AndesTech      ag101
  adp-ag101p                   nds32       n1213       adp-ag101p          AndesTech      ag101
 +adp-ag102                    nds32       n1213       adp-ag102           AndesTech      ag102
  nios2-generic                nios2       nios2       nios2-generic       altera
  PCI5441                      nios2       nios2       pci5441             psyent
  PK1C20                       nios2       nios2       pk1c20              psyent
@@@ -743,7 -742,6 +743,7 @@@ P2020RDB-PC_SPIFLASH         powerp
  P2020RDB_SDCARD              powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P2020RDB,SDCARD
  P2020RDB_SPIFLASH            powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P2020RDB,SPIFLASH
  P2041RDB                     powerpc     mpc85xx     p2041rdb            freescale
 +P2041RDB_NAND              powerpc     mpc85xx     p2041rdb            freescale      -           P2041RDB:RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF80000
  P2041RDB_SDCARD              powerpc     mpc85xx     p2041rdb            freescale      -           P2041RDB:RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF80000
  P2041RDB_SECURE_BOOT         powerpc     mpc85xx     p2041rdb            freescale      -           P2041RDB:SECURE_BOOT
  P2041RDB_SPIFLASH            powerpc     mpc85xx     p2041rdb            freescale      -           P2041RDB:RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF80000
@@@ -752,8 -750,6 +752,8 @@@ 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
 +P3041DS_SRIOBOOT_MASTER                    powerpc     mpc85xx     corenet_ds          freescale      -           P3041DS:SRIOBOOT_MASTER
 +P3041DS_SRIOBOOT_SLAVE          powerpc     mpc85xx     corenet_ds          freescale      -           P3041DS:SRIOBOOT_SLAVE,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
@@@ -761,15 -757,11 +761,15 @@@ P4080DS                      powerp
  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
  P4080DS_SPIFLASH           powerpc     mpc85xx     corenet_ds          freescale      -           P4080DS:RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF80000
 +P4080DS_SRIOBOOT_MASTER                    powerpc     mpc85xx     corenet_ds          freescale      -           P4080DS:SRIOBOOT_MASTER
 +P4080DS_SRIOBOOT_SLAVE          powerpc     mpc85xx     corenet_ds          freescale      -           P4080DS:SRIOBOOT_SLAVE,SYS_TEXT_BASE=0xFFF80000
  P5020DS                      powerpc     mpc85xx     corenet_ds          freescale
  P5020DS_NAND               powerpc     mpc85xx     corenet_ds          freescale      -           P5020DS:RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF80000
  P5020DS_SDCARD                     powerpc     mpc85xx     corenet_ds          freescale      -           P5020DS:RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF80000
  P5020DS_SECURE_BOOT          powerpc     mpc85xx     corenet_ds          freescale      -           P5020DS:SECURE_BOOT
  P5020DS_SPIFLASH           powerpc     mpc85xx     corenet_ds          freescale      -           P5020DS:RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF80000
 +P5020DS_SRIOBOOT_MASTER                    powerpc     mpc85xx     corenet_ds          freescale      -           P5020DS:SRIOBOOT_MASTER
 +P5020DS_SRIOBOOT_SLAVE          powerpc     mpc85xx     corenet_ds          freescale      -           P5020DS:SRIOBOOT_SLAVE,SYS_TEXT_BASE=0xFFF80000
  stxgp3                       powerpc     mpc85xx     stxgp3              stx
  stxssa                       powerpc     mpc85xx     stxssa              stx            -           stxssa
  stxssa_4M                    powerpc     mpc85xx     stxssa              stx            -           stxssa:STXSSA_4M
@@@ -990,7 -982,7 +990,7 @@@ intip                        powerp
  io                           powerpc     ppc4xx      405ep               gdsys
  io64                         powerpc     ppc4xx      405ex               gdsys
  iocon                        powerpc     ppc4xx      405ep               gdsys
- neo                          powerpc     ppc4xx      -                   gdsys
+ neo                          powerpc     ppc4xx      405ep               gdsys
  icon                         powerpc     ppc4xx      -                   mosaixtech
  MIP405                       powerpc     ppc4xx      mip405              mpl
  MIP405T                      powerpc     ppc4xx      mip405              mpl            -           MIP405:MIP405T