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

[u-boot] / boards.cfg

diff --git a/boards.cfg b/boards.cfg
index 59cc128f7cbffc08b68d6323cbd380cae58ceb75..05ddb8c69d42adb339d08dc8ca6e407ae61861c2 100644 (file)
--- a/boards.cfg
+++ b/boards.cfg
@@ -43,6 +43,7 @@ meesc         arm     arm926ejs       -               esd             at91
 otc570         arm     arm926ejs       -               esd             at91
 pm9261         arm     arm926ejs       -               ronetix         at91
 pm9263         arm     arm926ejs       -               ronetix         at91
+jadecpu                arm     arm926ejs       jadecpu         syteco          mb86r0x
 suen3          arm     arm926ejs       km_arm          keymile         kirkwood
 rd6281a                arm     arm926ejs       -               Marvell         kirkwood
 mx51evk                arm     armv7           mx51evk         freescale       mx51
@@ -52,6 +53,7 @@ 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 +63,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 +78,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 +132,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 +144,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
@@ -161,7 +161,7 @@ TOP860              powerpc mpc8xx          top860          emk
 kmsupx4                powerpc mpc8xx          km8xx           keymile
 mgsuvd         powerpc mpc8xx          km8xx           keymile
 KUP4K          powerpc mpc8xx          kup4k           kup
-KUP4X          powerpc mpc8xx          kup4k           kup
+KUP4X          powerpc mpc8xx          kup4x           kup
 ELPT860                powerpc mpc8xx          elpt860         LEOX
 CCM            powerpc mpc8xx          -               siemens
 IAD210         powerpc mpc8xx          -               siemens
@@ -284,6 +284,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
@@ -333,6 +334,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
@@ -342,8 +344,10 @@ MPC8540ADS powerpc mpc85xx         mpc8540ads      freescale
 MPC8544DS      powerpc mpc85xx         mpc8544ds       freescale
 MPC8560ADS     powerpc mpc85xx         mpc8560ads      freescale
 MPC8568MDS     powerpc mpc85xx         mpc8568mds      freescale
+P4080DS                powerpc mpc85xx         corenet_ds      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