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>

diff --cc board/logicpd/imx31_litekit/config.mk
index 0131edfbe9a651f510cb781d7c6cd3d673f8d4cc,a12c1824bf8c2b7509ef3a49c8742b6c27f83a6e..a7887ba44ff4da3bbf323d50d31142ad89ecc567
--- 1/board/logicpd/imx31_litekit/config.mk
--- 2/board/logicpd/imx31_litekit/config.mk
+++ b/board/logicpd/imx31_litekit/config.mk
@@@ -1,1 -1,1 +1,1 @@@
- CONFIG_SYS_TEXT_BASE = 0x87f00000
 -TEXT_BASE = 0xa0000000
++CONFIG_SYS_TEXT_BASE = 0xa0000000

diff --cc boards.cfg
index 3a965e9dc52136e94aede6c88fbac7f16ca0e881,884d9bacb63ec7786b2e2fd478c3a212ca7c4c40..c68c86e819a679173a4b74922febe2c85326653b
--- 1/boards.cfg
--- 2/boards.cfg
+++ b/boards.cfg
@@@ -43,11 -43,11 +43,11 @@@ meesc              arm     arm926ejs       -               esd             at9
  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
- vision2               arm     armv7           vision2         ttcontrol       mx51
 +jadecpu               arm     arm926ejs       jadecpu         syteco          mb86r0x
+ mx51evk               arm     armv7           mx51evk         freescale       mx5
+ vision2               arm     armv7           vision2         ttcontrol       mx5
  actux1                arm     ixp
  actux2                arm     ixp
  actux3                arm     ixp