diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-02-27 22:40:34 +0900 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-03-04 12:15:30 -0500 |
| commit | a86cf89c765d99c39b397abe3d9926ab3593f57a (patch) | |
| tree | 4f47ffcbe82047481fe366a8d3a24e3d26429e51 | |
| parent | 6b9709d91488993a8d7945995778cc63a24065ef (diff) | |
| download | u-boot-imx-a86cf89c765d99c39b397abe3d9926ab3593f57a.zip u-boot-imx-a86cf89c765d99c39b397abe3d9926ab3593f57a.tar.gz u-boot-imx-a86cf89c765d99c39b397abe3d9926ab3593f57a.tar.bz2 | |
kbuild: consolidate PLATFORM_LIBS
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>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/config.mk | 9 | ||||
| -rw-r--r-- | spl/Makefile | 2 |
3 files changed, 4 insertions, 9 deletions
@@ -653,7 +653,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 |