kbuild: consolidate PLATFORM_LIBS
Subsystems (2)
PATCH 1/1 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 <[email protected]>
---
Makefile | 2 +- arch/arm/config.mk | 9 ++------- spl/Makefile | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-)
Makefile +1 -1
@@ -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
arch/arm/config.mk +2 -7
@@ -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
spl/Makefile +1 -1
@@ -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
Signature · 1 line
1.8.3.2
PATCH 1/1 kbuild: consolidate PLATFORM_LIBS
Quoted 4 lines · Masahiro Yamada
We had switched to
Kbuildso now we can specify
PLATFORM_LIBS/PLATFORM_LIBGCC with relative path.Signed-off-by Masahiro Yamada <[email protected]>
Acked-by Tom Rini <[email protected]>
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140227/d8ba98b8/attachment.pgp>
PATCH 1/1 kbuild: consolidate PLATFORM_LIBS
Quoted 9 lines · Tom Rini
Quoted 4 lines · Masahiro Yamada
We had switched to
Kbuildso now we can specify
PLATFORM_LIBS/PLATFORM_LIBGCC with relative path.Signed-off-by Masahiro Yamada <[email protected]>Acked-by Tom Rini <[email protected]>
Acked-by Simon Glass <[email protected]>
Tested-by Simon Glass <[email protected]>
Quoted 7 lines · Masahiro Yamada
We had switched to
Kbuildso now we can specify
PLATFORM_LIBS/PLATFORM_LIBGCC with relative path.Signed-off-by Masahiro Yamada <[email protected]>Acked-by Tom Rini <[email protected]>Acked-by Simon Glass <[email protected]>Tested-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140304/b6749f7d/attachment.pgp>