summaryrefslogtreecommitdiff
path: root/boards.cfg
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-01-09 16:57:03 +0100
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-01-09 16:57:03 +0100
commitea33fb1a32e8e3f408b311823cabbb7453148f80 (patch)
treea81f26a32a32e33c2a25a82423d0bcc8ad48973a /boards.cfg
parent61bdb9133593f0f881a57232039296f64bd662ed (diff)
parentbfbfab94fd0b38ca780e6dda99657b0c848c9bb9 (diff)
downloadu-boot-imx-ea33fb1a32e8e3f408b311823cabbb7453148f80.zip
u-boot-imx-ea33fb1a32e8e3f408b311823cabbb7453148f80.tar.gz
u-boot-imx-ea33fb1a32e8e3f408b311823cabbb7453148f80.tar.bz2
Merge branch 'u-boot-marvell/master' into 'u-boot-arm/master'
Diffstat (limited to 'boards.cfg')
-rw-r--r--boards.cfg1
1 files changed, 1 insertions, 0 deletions
diff --git a/boards.cfg b/boards.cfg
index 388e4a4..1477f91 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -171,6 +171,7 @@ netspace_lite_v2 arm arm926ejs netspace_v2 LaCie
netspace_max_v2 arm arm926ejs netspace_v2 LaCie kirkwood lacie_kw:NETSPACE_MAX_V2
netspace_mini_v2 arm arm926ejs netspace_v2 LaCie kirkwood lacie_kw:NETSPACE_MINI_V2
netspace_v2 arm arm926ejs netspace_v2 LaCie kirkwood lacie_kw:NETSPACE_V2
+wireless_space arm arm926ejs wireless_space LaCie kirkwood
dreamplug arm arm926ejs - Marvell kirkwood
guruplug arm arm926ejs - Marvell kirkwood
mv88f6281gtw_ge arm arm926ejs - Marvell kirkwood