| Message ID | 1306101613-18200-7-git-send-email-michael@schwingen.org |
|---|---|
| State | Accepted |
| Commit | 363613a08ddeb258d3acde3e8c9b9340e3ab2d4d |
| Headers | show |
On Monday, May 23, 2011 12:00:02 AM Michael Schwingen wrote: > Signed-off-by: Michael Schwingen <michael@schwingen.org> > --- 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
Am 05/23/2011 02:42 AM, schrieb Marek Vasut: > On Monday, May 23, 2011 12:00:02 AM Michael Schwingen wrote: >> Signed-off-by: Michael Schwingen <michael@schwingen.org> >> --- > Honestly, I don't really understand this one ... Wolfgang, is this one OK to > merge ? The idea was to be able to define the LD_SCRIPT variable in the board config file. However, it seems that another patch in the toplevel config.mk added the same functionality after I wrote this, so this patch can be dropped completely. cu Michael
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
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 Changes for V5: arch/arm/config.mk | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)