| commit | dc74e08ba742d8fffa496e6958890d30b50d5e0a | [log] [tgz] |
|---|---|---|
| author | Michael Schwingen <michael@schwingen.org> | Mon May 23 00:00:02 2011 +0200 |
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | Thu Jun 23 08:24:55 2011 +0200 |
| tree | cc2c5e21a0f3997368a7d869a08fa86d72bddae1 | |
| parent | 3154c3d97b93a061cceea0d27e0999b7e04b3d91 [diff] |
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 ec1b420..788d4c1 100644 --- a/arch/arm/config.mk +++ b/arch/arm/config.mk
@@ -62,6 +62,13 @@ 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