| Message ID | 1393508434-3058-1-git-send-email-yamada.m@jp.panasonic.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Thu, Feb 27, 2014 at 10:40:34PM +0900, Masahiro Yamada wrote: > We had switched to Kbuild so now we can specify > PLATFORM_LIBS/PLATFORM_LIBGCC with relative path. > > Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Acked-by: Tom Rini <trini@ti.com>
On 27 February 2014 07:30, Tom Rini <trini@ti.com> wrote: > On Thu, Feb 27, 2014 at 10:40:34PM +0900, Masahiro Yamada wrote: > > > We had switched to Kbuild so now we can specify > > PLATFORM_LIBS/PLATFORM_LIBGCC with relative path. > > > > Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> > > Acked-by: Tom Rini <trini@ti.com> > Acked-by: Simon Glass <sjg@chromium.org> Tested-by: Simon Glass <sjg@chromium.org>
On Thu, Feb 27, 2014 at 10:40:34PM +0900, Masahiro Yamada wrote: > We had switched to Kbuild so now we can specify > PLATFORM_LIBS/PLATFORM_LIBGCC with relative path. > > Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> > Acked-by: Tom Rini <trini@ti.com> > Acked-by: Simon Glass <sjg@chromium.org> > Tested-by: Simon Glass <sjg@chromium.org> Applied to u-boot/master, thanks!
diff --git a/Makefile b/Makefile index fe9e144..89f1226 100644 --- a/Makefile +++ b/Makefile @@ -650,7 +650,7 @@ u-boot-main := $(libs-y) # Add GCC lib ifdef USE_PRIVATE_LIBGCC ifeq ("$(USE_PRIVATE_LIBGCC)", "yes") -PLATFORM_LIBGCC = $(OBJTREE)/arch/$(ARCH)/lib/lib.a +PLATFORM_LIBGCC = arch/$(ARCH)/lib/lib.a else PLATFORM_LIBGCC = -L $(USE_PRIVATE_LIBGCC) -lgcc endif diff --git a/arch/arm/config.mk b/arch/arm/config.mk index 17b7408..1db80be 100644 --- a/arch/arm/config.mk +++ b/arch/arm/config.mk @@ -67,13 +67,8 @@ ifneq (,$(findstring -mabi=aapcs-linux,$(PLATFORM_CPPFLAGS))) # times. Also, the prefix needs to be different based on whether # CONFIG_SPL_BUILD is defined or not. 'filter-out' the existing entry # before adding the correct one. -ifdef CONFIG_SPL_BUILD -PLATFORM_LIBS := $(SPLTREE)/arch/arm/lib/eabi_compat.o \ - $(filter-out %/arch/arm/lib/eabi_compat.o, $(PLATFORM_LIBS)) -else -PLATFORM_LIBS := $(OBJTREE)/arch/arm/lib/eabi_compat.o \ - $(filter-out %/arch/arm/lib/eabi_compat.o, $(PLATFORM_LIBS)) -endif +PLATFORM_LIBS := arch/arm/lib/eabi_compat.o \ + $(filter-out arch/arm/lib/eabi_compat.o, $(PLATFORM_LIBS)) endif # needed for relocation diff --git a/spl/Makefile b/spl/Makefile index 346d0aa..57bd43b 100644 --- a/spl/Makefile +++ b/spl/Makefile @@ -133,7 +133,7 @@ libs-y := $(patsubst %/, %/built-in.o, $(libs-y)) # Add GCC lib ifeq ("$(USE_PRIVATE_LIBGCC)", "yes") -PLATFORM_LIBGCC = $(SPLTREE)/arch/$(ARCH)/lib/lib.a +PLATFORM_LIBGCC = arch/$(ARCH)/lib/lib.a PLATFORM_LIBS := $(filter-out %/lib.a, $(filter-out -lgcc, $(PLATFORM_LIBS))) $(PLATFORM_LIBGCC) endif
We had switched to Kbuild so now we can specify PLATFORM_LIBS/PLATFORM_LIBGCC with relative path. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> --- Makefile | 2 +- arch/arm/config.mk | 9 ++------- spl/Makefile | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-)