From: Marek Vasut <marek.vasut@gmail.com>
Date: Sat, 7 Apr 2018 14:06:36 +0000 (+0200)
Subject: ARM: Fix Makefile during SPL and TPL build
X-Git-Tag: v2018.05-rc2~23
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a821a77aa748bf704a1494f322ed480e49a6118d;p=oweals%2Fu-boot.git

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>
---

diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile
index b5ffffd4e3..3d3085e917 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