From b130ea27d9d7c604e0f0921b6770d569c6cdfffb Mon Sep 17 00:00:00 2001
From: Pascal Brand <pascal.brand@st.com>
Date: Tue, 13 Oct 2015 13:18:36 +0200
Subject: [PATCH] Fix all-clean

Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Signed-off-by: Pascal Brand <pascal.brand@st.com>
---
 common.mk |  7 ++-----
 fvp.mk    | 24 +++++++++++++-----------
 hikey.mk  | 34 ++++++++++++----------------------
 3 files changed, 27 insertions(+), 38 deletions(-)

diff --git a/common.mk b/common.mk
index bbfc300..e1d3de6 100644
--- a/common.mk
+++ b/common.mk
@@ -66,9 +66,7 @@ linux-common: linux-defconfig
 	$(MAKE) -C $(LINUX_PATH) $(LINUX_COMMON_FLAGS)
 
 linux-defconfig-clean-common:
-	@if [ -f "$(LINUX_PATH)/.config" ]; then \
-		rm -f $(LINUX_PATH)/.config; \
-	fi
+	@rm -f $(LINUX_PATH)/.config
 
 LINUX_CLEAN_COMMON_FLAGS ?= $(LINUX_COMMON_FLAGS)
 	
@@ -80,7 +78,6 @@ LINUX_CLEANER_COMMON_FLAGS ?= $(LINUX_COMMON_FLAGS)
 linux-cleaner-common: linux-defconfig-clean
 	$(MAKE) -C $(LINUX_PATH) $(LINUX_CLEAN_COMMON_FLAGS) distclean
 
-
 ################################################################################
 # EDK2 / Tianocore
 ################################################################################
@@ -113,7 +110,7 @@ optee-os-common:
 
 OPTEE_OS_CLEAN_COMMON_FLAGS ?= $(OPTEE_OS_COMMON_FLAGS)
 
-optee-os-clean-common:
+optee-os-clean-common: xtest-clean
 	$(MAKE) -C $(OPTEE_OS_PATH) $(OPTEE_OS_CLEAN_COMMON_FLAGS) clean
 
 OPTEE_CLIENT_COMMON_FLAGS ?= CROSS_COMPILE=$(CROSS_COMPILE_NS_USER)
diff --git a/fvp.mk b/fvp.mk
index 82f4602..b1ad2c3 100644
--- a/fvp.mk
+++ b/fvp.mk
@@ -38,22 +38,24 @@ all-clean: arm-tf-clean busybox-clean edk2-clean optee-os-clean \
 ################################################################################
 # ARM Trusted Firmware
 ################################################################################
-arm-tf: optee-os edk2
+ARM_TF_EXPORTS ?= \
 	CFLAGS="-O0 -gdwarf-2" \
-	CROSS_COMPILE="$(CCACHE)$(AARCH64_NONE_CROSS_COMPILE)" \
+	CROSS_COMPILE="$(CCACHE)$(AARCH64_NONE_CROSS_COMPILE)"
+
+ARM_TF_FLAGS ?= \
 	BL32=$(OPTEE_OS_BIN) \
 	BL33=$(EDK2_BIN) \
-	make -C $(ARM_TF_PATH) \
-	       -j`getconf _NPROCESSORS_ONLN` \
-	       DEBUG=0 \
-	       FVP_TSP_RAM_LOCATION=tdram \
-	       FVP_SHARED_DATA_LOCATION=tdram \
-	       PLAT=fvp \
-	       SPD=opteed \
-	       all fip
+	DEBUG=0 \
+	FVP_TSP_RAM_LOCATION=tdram \
+	FVP_SHARED_DATA_LOCATION=tdram \
+	PLAT=fvp \
+	SPD=opteed
+
+arm-tf: optee-os edk2
+	$(ARM_TF_EXPORTS) $(MAKE) -C $(ARM_TF_PATH) $(ARM_TF_FLAGS) all fip
 
 arm-tf-clean:
-	make -C $(ARM_TF_PATH) clean
+	$(ARM_TF_EXPORTS) $(MAKE) -C $(ARM_TF_PATH) $(ARM_TF_FLAGS) clean
 
 ################################################################################
 # Busybox
diff --git a/hikey.mk b/hikey.mk
index 7b69b16..b02e0fa 100644
--- a/hikey.mk
+++ b/hikey.mk
@@ -68,34 +68,24 @@ mcuimage-cleaner:
 ################################################################################
 # ARM Trusted Firmware
 ################################################################################
-arm-tf: mcuimage optee-os edk2
+ARM_TF_EXPORTS ?= \
 	CFLAGS="-O0 -gdwarf-2" \
-	CROSS_COMPILE="$(CCACHE)$(AARCH64_CROSS_COMPILE)" \
+	CROSS_COMPILE="$(CCACHE)$(AARCH64_CROSS_COMPILE)"
+
+ARM_TF_FLAGS ?= \
 	BL32=$(OPTEE_OS_BIN) \
 	BL33=$(EDK2_BIN) \
 	NEED_BL30=yes \
 	BL30=$(MCUIMAGE_BIN) \
-	make -C $(ARM_TF_PATH) \
-	       -j`getconf _NPROCESSORS_ONLN` \
-	       DEBUG=$(DEBUG) \
-	       PLAT=hikey \
-	       SPD=opteed \
-	       all fip
-
-.PHONY: arm-tf-clean
+	DEBUG=$(DEBUG) \
+	PLAT=hikey \
+	SPD=opteed
+
+arm-tf: mcuimage optee-os edk2
+	$(ARM_TF_EXPORTS) $(MAKE) -C $(ARM_TF_PATH) $(ARM_TF_FLAGS) all fip
+
 arm-tf-clean:
-	CFLAGS="-O0 -gdwarf-2" \
-        CROSS_COMPILE="$(CCACHE)$(AARCH64_CROSS_COMPILE)" \
-        BL32=$(OPTEE_OS_BIN) \
-        BL33=$(EDK2_BIN) \
-        NEED_BL30=yes \
-        BL30=$(MCUIMAGE_BIN) \
-        make -C $(ARM_TF_PATH) \
-               -j`getconf _NPROCESSORS_ONLN` \
-               DEBUG=$(DEBUG) \
-               PLAT=hikey \
-               SPD=opteed \
-               clean
+	$(ARM_TF_EXPORTS) $(MAKE) -C $(ARM_TF_PATH) $(ARM_TF_FLAGS) clean
 
 ################################################################################
 # Busybox
-- 
GitLab