Merge branch 'master' of git://git.denx.de/u-boot-ti
[platform/kernel/u-boot.git] / boards.cfg
index a70f541..05ddb8c 100644 (file)
@@ -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
@@ -160,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