From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marek Vasut Date: Mon, 23 May 2011 02:42:24 +0200 Subject: [U-Boot] [IXP42x PATCH series v5 06/17] support CONFIG_SYS_LDSCRIPT on ARM In-Reply-To: <1306101613-18200-7-git-send-email-michael@schwingen.org> References: <1306101613-18200-1-git-send-email-michael@schwingen.org> <1306101613-18200-7-git-send-email-michael@schwingen.org> Message-ID: <201105230242.25001.marek.vasut@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Monday, May 23, 2011 12:00:02 AM Michael Schwingen wrote: > Signed-off-by: Michael Schwingen > --- Honestly, I don't really understand this one ... Wolfgang, is this one OK to merge ? > Changes for V3: > - new in V3, replaces config.mk files in earlier patches > Changes for V4: > - add changelog > Changes for V5: > > arch/arm/config.mk | 7 +++++++ > 1 files changed, 7 insertions(+), 0 deletions(-) > > 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 @@ 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