From: Wolfgang Denk Date: Tue, 19 Oct 2010 18:58:16 +0000 (+0200) Subject: Merge branch 'master' of git://git.denx.de/u-boot-imx X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=083d506937002f2795c80fe0c3ae194ad2c3d085;p=u-boot.git 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 --- 083d506937002f2795c80fe0c3ae194ad2c3d085 diff --cc board/logicpd/imx31_litekit/config.mk index 0131edfbe9,a12c1824bf..a7887ba44f --- a/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 3a965e9dc5,884d9bacb6..c68c86e819 --- a/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 +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