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

[platform/kernel/u-boot.git] / boards.cfg

diff --git a/boards.cfg b/boards.cfg
index 8aab169..05ddb8c 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
 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
 suen3          arm     arm926ejs       km_arm          keymile         kirkwood
 rd6281a                arm     arm926ejs       -               Marvell         kirkwood
 mx51evk                arm     armv7           mx51evk         freescale       mx51


@@ -143,7 +144,6 @@ EP88x               powerpc mpc8xx          ep88x
 ETX094         powerpc mpc8xx          etx094
 FLAGADM                powerpc mpc8xx          flagadm
 GENIETV                powerpc mpc8xx          genietv
 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
 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
 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
 ELPT860                powerpc mpc8xx          elpt860         LEOX
 CCM            powerpc mpc8xx          -               siemens
 IAD210         powerpc mpc8xx          -               siemens


@@ -344,6 +344,7 @@ MPC8540ADS  powerpc mpc85xx         mpc8540ads      freescale
 MPC8544DS      powerpc mpc85xx         mpc8544ds       freescale
 MPC8560ADS     powerpc mpc85xx         mpc8560ads      freescale
 MPC8568MDS     powerpc mpc85xx         mpc8568mds      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
 XPEDITE5200    powerpc mpc85xx         xpedite5200     xes
 XPEDITE5370    powerpc mpc85xx         xpedite5370     xes
 P1022DS                powerpc mpc85xx         p1022ds         freescale