projects
/
oweals
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3053fa0
)
support CONFIG_SYS_LDSCRIPT on ARM
author
Michael Schwingen
<michael@schwingen.org>
Sun, 22 May 2011 22:00:02 +0000
(
00:00
+0200)
committer
Albert ARIBAUD
<albert.u.boot@aribaud.net>
Thu, 23 Jun 2011 06:24:55 +0000
(08:24 +0200)
Signed-off-by: Michael Schwingen <michael@schwingen.org>
arch/arm/config.mk
patch
|
blob
|
history
diff --git
a/arch/arm/config.mk
b/arch/arm/config.mk
index ec1b4209518cdef8bd4a1bf979e363be7f708d3c..788d4c12b7a4e17aa6a767822230c126a899ecf1 100644
(file)
--- 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