aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Schwingen2011-05-23 00:00:02 +0200
committerAlbert ARIBAUD2011-06-23 08:24:55 +0200
commit363613a08ddeb258d3acde3e8c9b9340e3ab2d4d (patch)
treecc2c5e21a0f3997368a7d869a08fa86d72bddae1
parent3053fa0bfbdfcef1d3a6a142cf8ef66a0eccf417 (diff)
support CONFIG_SYS_LDSCRIPT on ARM
Signed-off-by: Michael Schwingen <michael@schwingen.org>
-rw-r--r--arch/arm/config.mk7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/config.mk b/arch/arm/config.mk
index ec1b4209518..788d4c12b7a 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