summaryrefslogtreecommitdiff
path: root/boards.cfg
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-01-08 20:48:26 +0100
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-01-08 20:48:26 +0100
commit6e51ca41002c5e92f7fec088320e340102dd3f5b (patch)
tree555a568280a97d8d504c78325da116cdfced9188 /boards.cfg
parente28d4a272f4e59185581f9c7252016872b4681e6 (diff)
parente0a1d598ef0155f31589c42db17ff4784e84ca67 (diff)
downloadu-boot-imx-6e51ca41002c5e92f7fec088320e340102dd3f5b.zip
u-boot-imx-6e51ca41002c5e92f7fec088320e340102dd3f5b.tar.gz
u-boot-imx-6e51ca41002c5e92f7fec088320e340102dd3f5b.tar.bz2
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'boards.cfg')
-rw-r--r--boards.cfg1
1 files changed, 0 insertions, 1 deletions
diff --git a/boards.cfg b/boards.cfg
index 01ff5b5..ba88c1d 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -327,7 +327,6 @@ Active arm armv7 omap3 isee igep00x0
Active arm armv7 omap3 logicpd am3517evm am3517_evm - Vaibhav Hiremath <hvaibhav@ti.com>
Active arm armv7 omap3 logicpd omap3som omap3_logic - Peter Barada <peter.barada@logicpd.com>
Active arm armv7 omap3 logicpd zoom1 omap3_zoom1 - Nishanth Menon <nm@ti.com>
-Active arm armv7 omap3 logicpd zoom2 omap3_zoom2 - Tom Rix <Tom.Rix@windriver.com>
Active arm armv7 omap3 matrix_vision mvblx omap3_mvblx - Michael Jones <michael.jones@matrix-vision.de>
Active arm armv7 omap3 nokia rx51 nokia_rx51 - Pali Rohár <pali.rohar@gmail.com>
Active arm armv7 omap3 technexion tao3530 omap3_ha tao3530:SYS_BOARD_OMAP3_HA Stefan Roese <sr@denx.de>