Merge branch 'master' of /home/wd/git/u-boot/master

[J-u-boot.git] / boards.cfg

diff --git a/boards.cfg b/boards.cfg
index 6efde75e6f6f400119116db96029068816840780..b82f530f46a76164ff71d1c5bba538065cd4df2d 100644 (file)
--- a/boards.cfg
+++ b/boards.cfg
@@ -45,13 +45,14 @@ pm9261              arm     arm926ejs       -               ronetix         at91
 pm9263         arm     arm926ejs       -               ronetix         at91
 suen3          arm     arm926ejs       km_arm          keymile         kirkwood
 rd6281a                arm     arm926ejs       -               Marvell         kirkwood
-mx51evk                arm     arm_cortexa8    mx51evk         freescale       mx51
+mx51evk                arm     armv7           mx51evk         freescale       mx51
 actux1         arm     ixp
 actux2         arm     ixp
 actux3         arm     ixp
 actux4         arm     ixp
 ixdp425                arm     ixp
 cerf250                arm     pxa
+colibri_pxa270 arm     pxa
 cradle         arm     pxa
 csb226         arm     pxa
 delta          arm     pxa
@@ -61,6 +62,7 @@ lubbock               arm     pxa
 pleb2          arm     pxa
 xaeniax                arm     pxa
 xm250          arm     pxa
+zipitz2                arm     pxa
 B2             arm     s3c44b0         -               dave
 assabet                arm     sa1100
 dnp1110                arm     sa1100
@@ -75,9 +77,6 @@ M5272C3               m68k    mcf52x2         m5272c3         freescale
 EP2500         m68k    mcf52x2         ep2500          Mercury
 purple         mips    mips
 tb0229         mips    mips
-EP1C20         nios2   nios2           ep1c20          altera
-EP1S10         nios2   nios2           ep1s10          altera
-EP1S40         nios2   nios2           ep1s40          altera
 PCI5441                nios2   nios2           pci5441         psyent
 PK1C20         nios2   nios2           pk1c20          psyent
 P3G4           powerpc 74xx_7xx        evb64260
@@ -132,6 +131,7 @@ ZPC1900             powerpc mpc8260         zpc1900
 mgcoge         powerpc mpc8260         -               keymile
 SCM            powerpc mpc8260         -               siemens
 TQM8272                powerpc mpc8260         tqm8272         tqc
+ve8313         powerpc mpc83xx         ve8313
 kmeter1                powerpc mpc83xx         kmeter1         keymile
 MVBLM7         powerpc mpc83xx         mvblm7          matrix_vision
 TQM834x                powerpc mpc83xx         tqm834x         tqc
@@ -143,7 +143,6 @@ EP88x               powerpc mpc8xx          ep88x
 ETX094         powerpc mpc8xx          etx094
 FLAGADM                powerpc mpc8xx          flagadm
 GENIETV                powerpc mpc8xx          genietv
-GTH            powerpc mpc8xx          gth
 hermes         powerpc mpc8xx
 IP860          powerpc mpc8xx          ip860
 LANTEC         powerpc mpc8xx          lantec
@@ -180,9 +179,10 @@ G2000              powerpc ppc4xx          g2000
 JSE            powerpc ppc4xx          jse
 korat          powerpc ppc4xx
 lwmon5         powerpc ppc4xx
-ML2            powerpc ppc4xx
+ML2            powerpc ppc4xx          ml2
 sbc405         powerpc ppc4xx
 sc3            powerpc ppc4xx
+t3corp         powerpc ppc4xx
 zeus           powerpc ppc4xx
 acadia         powerpc ppc4xx          -               amcc
 bamboo         powerpc ppc4xx          -               amcc
@@ -254,15 +254,19 @@ imx27lite arm     arm926ejs       imx27lite       logicpd         mx27
 magnesium      arm     arm926ejs       imx27lite       logicpd         mx27
 omap5912osk    arm     arm926ejs       -               ti              omap
 edminiv2       arm     arm926ejs       -               LaCie           orion5x
-omap3_overo    arm     arm_cortexa8    overo           -               omap3
-omap3_pandora  arm     arm_cortexa8    pandora         -               omap3
-omap3_zoom1    arm     arm_cortexa8    zoom1           logicpd         omap3
-omap3_zoom2    arm     arm_cortexa8    zoom2           logicpd         omap3
-omap3_beagle   arm     arm_cortexa8    beagle          ti              omap3
-omap3_evm      arm     arm_cortexa8    evm             ti              omap3
-omap3_sdp3430  arm     arm_cortexa8    sdp3430         ti              omap3
-devkit8000     arm     arm_cortexa8    devkit8000      timll           omap3
-smdkc100       arm     arm_cortexa8    smdkc100        samsung         s5pc1xx
+omap3_overo    arm     armv7           overo           -               omap3
+omap3_pandora  arm     armv7           pandora         -               omap3
+omap3_zoom1    arm     armv7           zoom1           logicpd         omap3
+omap3_zoom2    arm     armv7           zoom2           logicpd         omap3
+omap3_beagle   arm     armv7           beagle          ti              omap3
+omap3_evm      arm     armv7           evm             ti              omap3
+omap3_sdp3430  arm     armv7           sdp3430         ti              omap3
+omap4_panda    arm     armv7           panda           ti              omap4
+omap4_sdp4430  arm     armv7           sdp4430         ti              omap4
+am3517_evm     arm     armv7           am3517evm       logicpd         omap3
+devkit8000     arm     armv7           devkit8000      timll           omap3
+s5p_goni       arm     armv7           goni            samsung         s5pc1xx
+smdkc100       arm     armv7           smdkc100        samsung         s5pc1xx
 ixdpg425       arm     ixp
 lpd7a400       arm     lh7a40x         lpd7a40x
 lpd7a404       arm     lh7a40x         lpd7a40x
@@ -279,6 +283,7 @@ favr-32-ezkit       avr32   at32ap          -               earthlcd        at32ap700x
 hammerhead     avr32   at32ap          -               miromico        at32ap700x
 bf518f-ezbrd   blackfin        blackfin
 bf526-ezbrd    blackfin        blackfin
+bf527-ad7160-eval blackfin     blackfin
 bf527-ezkit    blackfin        blackfin
 bf533-ezkit    blackfin        blackfin
 bf533-stamp    blackfin        blackfin
@@ -314,7 +319,6 @@ M5282EVB    m68k    mcf52x2         m5282evb        freescale
 M53017EVB      m68k    mcf52x2         m53017evb       freescale
 microblaze-generic     microblaze      microblaze      microblaze-generic      xilinx
 mpc7448hpc2    powerpc 74xx_7xx        mpc7448hpc2     freescale
-AmigaOneG3SE   powerpc 74xx_7xx        AmigaOneG3SE    MAI
 pdm360ng       powerpc mpc512x
 mecp5123       powerpc mpc512x         -               esd
 cmi_mpc5xx     powerpc mpc5xx          cmi
@@ -329,6 +333,7 @@ ppmc8260    powerpc mpc8260
 RPXsuper       powerpc mpc8260         rpxsuper
 rsdproto       powerpc mpc8260
 MPC8266ADS     powerpc mpc8260         mpc8266ads      freescale
+MPC8308RDB     powerpc mpc83xx         mpc8308rdb      freescale
 MPC8323ERDB    powerpc mpc83xx         mpc8323erdb     freescale
 MPC8349EMDS    powerpc mpc83xx         mpc8349emds     freescale
 MPC837XERDB    powerpc mpc83xx         mpc837xerdb     freescale
@@ -340,6 +345,7 @@ MPC8560ADS  powerpc mpc85xx         mpc8560ads      freescale
 MPC8568MDS     powerpc mpc85xx         mpc8568mds      freescale
 XPEDITE5200    powerpc mpc85xx         xpedite5200     xes
 XPEDITE5370    powerpc mpc85xx         xpedite5370     xes
+P1022DS                powerpc mpc85xx         p1022ds         freescale
 sbc8641d       powerpc mpc86xx
 MPC8610HPCD    powerpc mpc86xx         mpc8610hpcd     freescale
 XPEDITE5170    powerpc mpc86xx         xpedite5170     xes