| Message ID | 1319451263-15280-1-git-send-email-marek.vasut@gmail.com |
|---|---|
| State | Accepted |
| Commit | 99bd341b96d42139429c0d9da58f59b8395e407e |
| Delegated to: | Albert ARIBAUD |
| Headers | show |
> This allows the SPL to avoid compiling in the CPU support code. > > Signed-off-by: Marek Vasut <marek.vasut@gmail.com> > Cc: Stefano Babic <sbabic@denx.de> > Cc: Wolfgang Denk <wd@denx.de> > Cc: Detlev Zundel <dzu@denx.de> > Cc: Scott Wood <scottwood@freescale.com> > --- > arch/arm/cpu/arm926ejs/Makefile | 6 ++++++ > 1 files changed, 6 insertions(+), 0 deletions(-) > > V2: Don't frob with cpu.o as it's going to be removed anyway. > > diff --git a/arch/arm/cpu/arm926ejs/Makefile > b/arch/arm/cpu/arm926ejs/Makefile index 930e0d1..a56ff08 100644 > --- a/arch/arm/cpu/arm926ejs/Makefile > +++ b/arch/arm/cpu/arm926ejs/Makefile > @@ -28,6 +28,12 @@ LIB = $(obj)lib$(CPU).o > START = start.o > COBJS = cpu.o > > +ifdef CONFIG_SPL_BUILD > +ifdef CONFIG_SPL_NO_CPU_SUPPORT_CODE > +START := > +endif > +endif > + > SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c) > OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS)) > START := $(addprefix $(obj),$(START)) Hi Albert, can you apply please? Thanks
> > This allows the SPL to avoid compiling in the CPU support code. > > > > Signed-off-by: Marek Vasut <marek.vasut@gmail.com> > > Cc: Stefano Babic <sbabic@denx.de> > > Cc: Wolfgang Denk <wd@denx.de> > > Cc: Detlev Zundel <dzu@denx.de> > > Cc: Scott Wood <scottwood@freescale.com> > > --- > > > > arch/arm/cpu/arm926ejs/Makefile | 6 ++++++ > > 1 files changed, 6 insertions(+), 0 deletions(-) > > > > V2: Don't frob with cpu.o as it's going to be removed anyway. > > > > diff --git a/arch/arm/cpu/arm926ejs/Makefile > > b/arch/arm/cpu/arm926ejs/Makefile index 930e0d1..a56ff08 100644 > > --- a/arch/arm/cpu/arm926ejs/Makefile > > +++ b/arch/arm/cpu/arm926ejs/Makefile > > @@ -28,6 +28,12 @@ LIB = $(obj)lib$(CPU).o > > > > START = start.o > > COBJS = cpu.o > > > > +ifdef CONFIG_SPL_BUILD > > +ifdef CONFIG_SPL_NO_CPU_SUPPORT_CODE > > +START := > > +endif > > +endif > > + > > > > SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c) > > OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS)) > > START := $(addprefix $(obj),$(START)) > > Hi Albert, > > can you apply please? > > Thanks Ping ?
Hi Marek, Le 24/10/2011 12:14, Marek Vasut a écrit : > This allows the SPL to avoid compiling in the CPU support code. > > Signed-off-by: Marek Vasut<marek.vasut@gmail.com> > Cc: Stefano Babic<sbabic@denx.de> > Cc: Wolfgang Denk<wd@denx.de> > Cc: Detlev Zundel<dzu@denx.de> > Cc: Scott Wood<scottwood@freescale.com> > --- > arch/arm/cpu/arm926ejs/Makefile | 6 ++++++ > 1 files changed, 6 insertions(+), 0 deletions(-) > > V2: Don't frob with cpu.o as it's going to be removed anyway. > > diff --git a/arch/arm/cpu/arm926ejs/Makefile b/arch/arm/cpu/arm926ejs/Makefile > index 930e0d1..a56ff08 100644 > --- a/arch/arm/cpu/arm926ejs/Makefile > +++ b/arch/arm/cpu/arm926ejs/Makefile > @@ -28,6 +28,12 @@ LIB = $(obj)lib$(CPU).o > START = start.o > COBJS = cpu.o > > +ifdef CONFIG_SPL_BUILD > +ifdef CONFIG_SPL_NO_CPU_SUPPORT_CODE > +START := > +endif > +endif > + > SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c) > OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS)) > START := $(addprefix $(obj),$(START)) Applied to u-boot-arm/master, thanks! Amicalement,
diff --git a/arch/arm/cpu/arm926ejs/Makefile b/arch/arm/cpu/arm926ejs/Makefile index 930e0d1..a56ff08 100644 --- a/arch/arm/cpu/arm926ejs/Makefile +++ b/arch/arm/cpu/arm926ejs/Makefile @@ -28,6 +28,12 @@ LIB = $(obj)lib$(CPU).o START = start.o COBJS = cpu.o +ifdef CONFIG_SPL_BUILD +ifdef CONFIG_SPL_NO_CPU_SUPPORT_CODE +START := +endif +endif + SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS)) START := $(addprefix $(obj),$(START))
This allows the SPL to avoid compiling in the CPU support code. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Wolfgang Denk <wd@denx.de> Cc: Detlev Zundel <dzu@denx.de> Cc: Scott Wood <scottwood@freescale.com> --- arch/arm/cpu/arm926ejs/Makefile | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) V2: Don't frob with cpu.o as it's going to be removed anyway.