From: Michael Schwingen <michael@schwingen.org>
Date: Sun, 22 May 2011 22:00:02 +0000 (+0200)
Subject: support CONFIG_SYS_LDSCRIPT on ARM
X-Git-Tag: v2011.06~5^2~11
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=363613a08ddeb258d3acde3e8c9b9340e3ab2d4d;p=oweals%2Fu-boot.git

support CONFIG_SYS_LDSCRIPT on ARM

Signed-off-by: Michael Schwingen <michael@schwingen.org>
---

diff --git a/arch/arm/config.mk b/arch/arm/config.mk
index ec1b420951..788d4c12b7 100644
--- a/arch/arm/config.mk
+++ b/arch/arm/config.mk
@@ -62,6 +62,13 @@ PLATFORM_LIBS += $(OBJTREE)/arch/arm/lib/eabi_compat.o
 endif
 endif
 
+ifdef CONFIG_SYS_LDSCRIPT
+# need to strip off double quotes
+LDSCRIPT := $(subst ",,$(CONFIG_SYS_LDSCRIPT))
+else
+LDSCRIPT := $(SRCTREE)/$(CPUDIR)/u-boot.lds
+endif
+
 # needed for relocation
 ifndef CONFIG_NAND_SPL
 LDFLAGS_u-boot += -pie