summaryrefslogtreecommitdiffstats
path: root/board/ti
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-09-28 23:30:47 +0200
committerWolfgang Denk <wd@denx.de>2010-09-28 23:30:47 +0200
commit2e6e1772c0e34871769be4aef79748fe3e47d953 (patch)
tree00e4e19d7bccd2a1cd5753854ff4c2b8a26bebb0 /board/ti
parent1e4e5ef0469050f014aee1204dae8a9ab6053e49 (diff)
parent3df61957938586c512c17e72d83551d190400981 (diff)
downloadu-boot-2e6e1772c0e34871769be4aef79748fe3e47d953.tar.gz
u-boot-2e6e1772c0e34871769be4aef79748fe3e47d953.tar.xz
u-boot-2e6e1772c0e34871769be4aef79748fe3e47d953.zip
Merge branch 'next' of /home/wd/git/u-boot/next
Conflicts: include/ppc4xx.h Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'board/ti')
-rw-r--r--board/ti/beagle/config.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/board/ti/beagle/config.mk b/board/ti/beagle/config.mk
index 879b2e236f..6fb10e31e3 100644
--- a/board/ti/beagle/config.mk
+++ b/board/ti/beagle/config.mk
@@ -30,4 +30,4 @@
# (mem base + reserved)
# For use with external or internal boots.
-TEXT_BASE = 0x80e80000
+TEXT_BASE = 0x80008000