summaryrefslogtreecommitdiffstats
path: root/boards.cfg
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-07-28 12:26:21 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-07-28 12:26:21 +0200
commitb1cdd8baa14f518288ceddb391d6587c1ecb3174 (patch)
treec3d00b3193b2ee86b9679baf1933b10a7d07a13d /boards.cfg
parent48b3ed217f58487c583d59575d7dfe2aafbb738d (diff)
parent434f2cfcad9f70231ad5a096325ba72ef0d2a2cc (diff)
downloadblackbird-obmc-uboot-b1cdd8baa14f518288ceddb391d6587c1ecb3174.tar.gz
blackbird-obmc-uboot-b1cdd8baa14f518288ceddb391d6587c1ecb3174.zip
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'boards.cfg')
-rw-r--r--boards.cfg3
1 files changed, 2 insertions, 1 deletions
diff --git a/boards.cfg b/boards.cfg
index 4ab43475a4..c0afa80cc0 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -300,7 +300,8 @@ Active arm armv7 exynos samsung trats
Active arm armv7 exynos samsung trats2 trats2 - Piotr Wilczek <p.wilczek@samsung.com>
Active arm armv7 exynos samsung universal_c210 s5pc210_universal - Przemyslaw Marczak <p.marczak@samsung.com>
Active arm armv7 highbank - highbank highbank - Rob Herring <robh@kernel.org>
-Active arm armv7 keystone ti k2hk_evm k2hk_evm - Vitaly Andrianov <vitalya@ti.com>
+Active arm armv7 keystone ti ks2_evm k2hk_evm - Vitaly Andrianov <vitalya@ti.com>
+Active arm armv7 keystone ti ks2_evm k2e_evm - Vitaly Andrianov <vitalya@ti.com>
Active arm armv7 mx5 denx m53evk m53evk m53evk:IMX_CONFIG=board/denx/m53evk/imximage.cfg Marek Vasut <marek.vasut@gmail.com>
Active arm armv7 mx5 esg ima3-mx53 ima3-mx53 ima3-mx53:IMX_CONFIG=board/esg/ima3-mx53/imximage.cfg -
Active arm armv7 mx5 freescale mx51evk mx51evk mx51evk:IMX_CONFIG=board/freescale/mx51evk/imximage.cfg Stefano Babic <sbabic@denx.de>
OpenPOWER on IntegriCloud