diff options
| author | Marek Vasut | 2018-04-07 16:06:36 +0200 |
|---|---|---|
| committer | Tom Rini | 2018-04-11 13:22:06 -0400 |
| commit | a821a77aa748bf704a1494f322ed480e49a6118d (patch) | |
| tree | ce55b0c8ca1685a8e6d9195c7d99f6e1de6eb38a | |
| parent | a9d7990dc4bde63a30ebeb2f2f49f6e2b9283605 (diff) | |
ARM: Fix Makefile during SPL and TPL build
The tiny variants of memset and memcpy implementations can be
built for TPL as well, check whether a TPL build is in progress
and avoid including the default variants.
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Tom Rini <trini@konsulko.com>
| -rw-r--r-- | arch/arm/lib/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile index b5ffffd4e31..3d3085e917b 100644 --- a/arch/arm/lib/Makefile +++ b/arch/arm/lib/Makefile @@ -41,8 +41,8 @@ obj-$(CONFIG_SPL_FRAMEWORK) += spl.o obj-$(CONFIG_SPL_FRAMEWORK) += zimage.o obj-$(CONFIG_OF_LIBFDT) += bootm-fdt.o endif -obj-$(CONFIG_$(SPL_)USE_ARCH_MEMSET) += memset.o -obj-$(CONFIG_$(SPL_)USE_ARCH_MEMCPY) += memcpy.o +obj-$(CONFIG_$(SPL_TPL_)USE_ARCH_MEMSET) += memset.o +obj-$(CONFIG_$(SPL_TPL_)USE_ARCH_MEMCPY) += memcpy.o obj-$(CONFIG_SEMIHOSTING) += semihosting.o obj-y += sections.o |