From: Simon Glass Date: Mon, 21 Nov 2011 10:49:41 +0000 (+0000) Subject: arm: Remove unneeded setting of LDCSRIPT X-Git-Tag: v2012.04-rc1~19^2~2 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9492791ab462c586424217f4b6e34f61f9ef5461;p=u-boot arm: Remove unneeded setting of LDCSRIPT This is set by the top level Makefile anyway, so drop it. This does have the effect of changing the order - now the board link script will have preference over the CPU one. But this seems more correct anyway. Signed-off-by: Simon Glass --- diff --git a/arch/arm/config.mk b/arch/arm/config.mk index 45f9dca5d5..3c5f987167 100644 --- a/arch/arm/config.mk +++ b/arch/arm/config.mk @@ -70,13 +70,6 @@ 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