Merge branch 'master' of ../master

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

diff --git a/boards.cfg b/boards.cfg
index fce1aac01fa29a6335b84cd991ca38eade906aec..a9be4390ae0a0bf149e05220914de12dd06e7960 100644 (file)
--- a/boards.cfg
+++ b/boards.cfg
@@ -45,7 +45,7 @@ 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
@@ -75,9 +75,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
@@ -256,17 +253,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
-am3517_evm     arm     arm_cortexa8    am3517evm       logicpd         omap3
-devkit8000     arm     arm_cortexa8    devkit8000      timll           omap3
-s5p_goni       arm     arm_cortexa8    goni            samsung         s5pc1xx
-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