diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-10-19 20:58:16 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-19 20:58:16 +0200 |
| commit | 083d506937002f2795c80fe0c3ae194ad2c3d085 (patch) | |
| tree | 3f7685842824cbd42c290d575d39a7dd3d01bccd /boards.cfg | |
| parent | b485556be51d1edae0a2c0065e2f572ca42a1eee (diff) | |
| parent | b952c24adeb7bfdb09f60d5d1f49fa86a2686c1c (diff) | |
| download | blackbird-obmc-uboot-083d506937002f2795c80fe0c3ae194ad2c3d085.tar.gz blackbird-obmc-uboot-083d506937002f2795c80fe0c3ae194ad2c3d085.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-imx
Conflicts:
board/logicpd/imx31_litekit/config.mk
boards.cfg
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'boards.cfg')
| -rw-r--r-- | boards.cfg | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/boards.cfg b/boards.cfg index 3a965e9dc5..c68c86e819 100644 --- a/boards.cfg +++ b/boards.cfg @@ -46,8 +46,8 @@ pm9263 arm arm926ejs - ronetix at91 suen3 arm arm926ejs km_arm keymile kirkwood rd6281a arm arm926ejs - Marvell kirkwood jadecpu arm arm926ejs jadecpu syteco mb86r0x -mx51evk arm armv7 mx51evk freescale mx51 -vision2 arm armv7 vision2 ttcontrol mx51 +mx51evk arm armv7 mx51evk freescale mx5 +vision2 arm armv7 vision2 ttcontrol mx5 actux1 arm ixp actux2 arm ixp actux3 arm ixp |
