| Message ID | 1302126558-1318-7-git-send-email-michael@schwingen.org |
|---|---|
| State | Superseded |
| Delegated to: | Marek Vasut |
| Headers | show |
On Wednesday, April 06, 2011 11:49:07 PM Michael Schwingen wrote: > Signed-off-by: Michael Schwingen <michael@schwingen.org> > --- > Changes for V3: > - new in V3, replaces config.mk files in earlier patches > Changes for V4: > - add changelog > > arch/arm/config.mk | 6 ++++++ > 1 files changed, 6 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/config.mk b/arch/arm/config.mk > index a6a4742..a7c4d27 100644 > --- a/arch/arm/config.mk > +++ b/arch/arm/config.mk > @@ -63,7 +63,13 @@ ifeq (,$(findstring > arch/arm/lib/eabi_compat.o,$(PLATFORM_LIBS))) 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 Hi, this one doesn't apply for me ...
diff --git a/arch/arm/config.mk b/arch/arm/config.mk index a6a4742..a7c4d27 100644 --- a/arch/arm/config.mk +++ b/arch/arm/config.mk @@ -63,7 +63,13 @@ ifeq (,$(findstring arch/arm/lib/eabi_compat.o,$(PLATFORM_LIBS))) 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
Signed-off-by: Michael Schwingen <michael@schwingen.org> --- Changes for V3: - new in V3, replaces config.mk files in earlier patches Changes for V4: - add changelog arch/arm/config.mk | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)