summaryrefslogtreecommitdiffstats
path: root/board/integratorcp/config.mk
diff options
context:
space:
mode:
authorWolfgang Denk <wd@nyx.denx.de>2006-10-11 14:15:21 +0200
committerWolfgang Denk <wd@nyx.denx.de>2006-10-11 14:15:21 +0200
commitfb883a521e04437acfe989de3e152b2e4866856b (patch)
tree0cf61f45ae693082b24ced9c1da9a87bdd0cabbd /board/integratorcp/config.mk
parent4a39616da41840bbc5b4c3f69df9861c2e6a8425 (diff)
parent2255b2d2044d434463eb2661e18018e50f1643d9 (diff)
downloadu-boot-fb883a521e04437acfe989de3e152b2e4866856b.tar.gz
u-boot-fb883a521e04437acfe989de3e152b2e4866856b.tar.xz
u-boot-fb883a521e04437acfe989de3e152b2e4866856b.zip
Merge with /home/wd/git/u-boot/master
Diffstat (limited to 'board/integratorcp/config.mk')
-rw-r--r--board/integratorcp/config.mk6
1 files changed, 6 insertions, 0 deletions
diff --git a/board/integratorcp/config.mk b/board/integratorcp/config.mk
index 25b79b3e79..e4c5c3b57a 100644
--- a/board/integratorcp/config.mk
+++ b/board/integratorcp/config.mk
@@ -3,3 +3,9 @@
#
TEXT_BASE = 0x01000000
+
+ifneq ($(OBJTREE),$(SRCTREE))
+# We are building u-boot in a separate directory, use generated
+# .lds script from OBJTREE directory.
+LDSCRIPT := $(OBJTREE)/board/$(BOARDDIR)/u-boot.lds
+endif