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

[karo-tx-uboot.git] / boards.cfg

diff --git a/boards.cfg b/boards.cfg
index b7017374753d4a9446a2e2beb47800baee066239..6c2a6672ff314816a27a6806a76ee0b122cadc8a 100644 (file)
--- a/boards.cfg
+++ b/boards.cfg
@@ -65,7 +65,6 @@ balloon3      arm     pxa
 cerf250                arm     pxa
 cradle         arm     pxa
 csb226         arm     pxa
-delta          arm     pxa
 innokom                arm     pxa
 lubbock                arm     pxa
 palmld         arm     pxa
@@ -402,8 +401,6 @@ lpd7a400    arm     lh7a40x         lpd7a40x
 lpd7a404       arm     lh7a40x         lpd7a40x
 colibri_pxa270 arm     pxa
 pxa255_idp     arm     pxa
-wepep250       arm     pxa
-xsengine       arm     pxa
 zylonite       arm     pxa
 atngw100       avr32   at32ap          -               atmel           at32ap700x
 atstk1002      avr32   at32ap          atstk1000       atmel           at32ap700x
@@ -416,6 +413,7 @@ bct-brettl2 blackfin        blackfin
 bf518f-ezbrd   blackfin        blackfin
 bf526-ezbrd    blackfin        blackfin
 bf527-ezkit    blackfin        blackfin
+bf527-ezkit-v2 blackfin        blackfin        bf527-ezkit     -       -       bf527-ezkit:BF527_EZKIT_REV_2_1
 bf527-sdp      blackfin        blackfin
 bf533-ezkit    blackfin        blackfin
 bf533-stamp    blackfin        blackfin
@@ -527,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
@@ -556,8 +553,9 @@ MPC8540ADS  powerpc mpc85xx         mpc8540ads      freescale
 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 +595,7 @@ P2020RDB_NAND       powerpc mpc85xx         p1_p2_rdb       freescale       -       P1_P2_RDB:P2020,NAND
 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
@@ -644,11 +642,13 @@ 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
 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