Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx

[u-boot] / board / trab / config.mk

diff --git a/board/trab/config.mk b/board/trab/config.mk
index 37ed5b1cce475bf8dbd9033cb88a706035ff9603..88f3beb5aac78c4ab185779bac83ad599ef7ce8a 100644 (file)
--- a/board/trab/config.mk
+++ b/board/trab/config.mk
@@ -1,6 +1,6 @@
 #
 # (C) Copyright 2002
-# Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+# Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
 #
 # TRAB board with S3C2400X (arm920t) cpu
 #
@@ -8,16 +8,21 @@
 #
 
 #
-# TRAB has 1 bank of 16 MB DRAM
+# TRAB has 1 bank of 16 MB or 32 MB DRAM
 #
 # 0c00'0000 to 0e00'0000
 #
 # Linux-Kernel is expected to be at 0c00'8000, entry 0c00'8000
 #
-# we load ourself to 0cf0'0000
+# we load ourself to 0CF0'0000 / 0DF0'0000
 #
-# download areas is 0c80'0000
+# download areas is 0C80'0000
 #
 
+sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
-TEXT_BASE = 0x0cf00000
+ifndef TEXT_BASE
+TEXT_BASE = 0x0DF40000
+endif
+
+LDSCRIPT := $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds