Merge branch 'master' of git://git.denx.de/u-boot-blackfin
[platform/kernel/u-boot.git] / boards.cfg
index 2bbcd8d..6c2a667 100644 (file)
@@ -525,7 +525,6 @@ MPC8272ADS  powerpc mpc8260         mpc8260ads      freescale       -       MPC8260ADS:ADSTYPE=CONFIG_SYS
 PQ2FADS-VR     powerpc mpc8260         mpc8260ads      freescale       -       MPC8260ADS:ADSTYPE=CONFIG_SYS_PQ2FADS,8260_CLKIN=66000000
 PQ2FADS-ZU     powerpc mpc8260         mpc8260ads      freescale       -       MPC8260ADS:ADSTYPE=CONFIG_SYS_PQ2FADS
 PQ2FADS_lowboot        powerpc mpc8260         mpc8260ads      freescale       -       MPC8260ADS:ADSTYPE=CONFIG_SYS_PQ2FADS,SYS_TEXT_BASE=0xFF800000
-VoVPN-GW_100MHz        powerpc mpc8260         vovpn-gw        funkwerk        -       VoVPN-GW:CLKIN_100MHz
 VoVPN-GW_66MHz powerpc mpc8260         vovpn-gw        funkwerk        -       VoVPN-GW:CLKIN_66MHz
 MPC8308RDB     powerpc mpc83xx         mpc8308rdb      freescale
 MPC8323ERDB    powerpc mpc83xx         mpc8323erdb     freescale
@@ -643,6 +642,8 @@ CPCI405AB   powerpc ppc4xx          cpci405         esd
 CPCI405DT      powerpc ppc4xx          cpci405         esd
 dlvision       powerpc ppc4xx          -               gdsys
 gdppc440etx    powerpc ppc4xx          -               gdsys
+io             powerpc ppc4xx          405ep           gdsys
+iocon          powerpc ppc4xx          405ep           gdsys
 CPCIISER4      powerpc ppc4xx          cpciiser4       esd
 DASA_SIM       powerpc ppc4xx          dasa_sim        esd
 PMC405DE       powerpc ppc4xx          pmc405de        esd