From 49f748f42c3b7eabe5f323ad38b7288f8f9c6b4f Mon Sep 17 00:00:00 2001
From: Vishal Bhoj <vishal.bhoj@linaro.org>
Date: Fri, 1 Dec 2017 10:37:16 +0000
Subject: optee: include missing config updates

missing changes from this patch:
https://android-review.linaro.org/#/c/17488/1..8

Change-Id: I29f2958ce767f0414c6d27bc1b560910fca16068
Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
---
 bootloader/Makefile         | 10 ++++++++--
 uefi-tools/opteed-build.sh  |  3 +++
 uefi-tools/platforms.config |  2 ++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/bootloader/Makefile b/bootloader/Makefile
index d128cedc..35556463 100644
--- a/bootloader/Makefile
+++ b/bootloader/Makefile
@@ -12,8 +12,12 @@ else
 	TARGET = RELEASE
 endif
 
+CMD_RM_OPTEE_OS_OUT = true
+CMD_RM_FIP_BIN = true
 ifeq ($(TARGET_TEE_IS_OPTEE), true)
        UEFI_BUILD_EXTRA_ARGS+=-s $(OPTEE_OS_DIR)
+       CMD_RM_OPTEE_OS_OUT = rm -fr $(OPTEE_OS_DIR)/out
+       CMD_RM_FIP_BIN = rm -f $(EDK2_DIR)/Build/HiKey/$(TARGET)_GCC49/FV/fip.bin $(DIST_DIR)/fip.bin
 endif
 
 all: $(DIST_DIR)/fip.bin $(DIST_DIR)/l-loader.bin
@@ -26,6 +30,8 @@ $(DIST_DIR)/fip.bin:
 	rm -rf OpenPlatformPkg && \
 	ln -sf  $(EDK2_DIR)/../OpenPlatformPkg OpenPlatformPkg && \
 	rm -rf $(EDK2_DIR)/Build/  && \
+	$(CMD_RM_OPTEE_OS_OUT) && \
+	$(CMD_RM_FIP_BIN) && \
 	mkdir -p $(EDK2_DIR)/Build/ && \
 	mkdir -p $(DIST_DIR) && \
 	mkdir -p $(ANDROID_BUILD_TOP)/$(PRODUCT_OUT)/obj/uefi && \
@@ -40,5 +46,5 @@ $(DIST_DIR)/l-loader.bin: $(DIST_DIR)/fip.bin
 	mv l-loader.bin $(DIST_DIR)/
 
 clean:
-	rm -rf $(DIST_DIR)/fip.bin $(DIST_DIR)/l-loader.bin
-
+	rm -rf $(DIST_DIR)/fip.bin $(DIST_DIR)/l-loader.bin $(ANDROID_BUILD_TOP)/$(PRODUCT_OUT)/obj/uefi $(EDK2_DIR)/Build/HiKey
+	cd $(EDK2_DIR)/BaseTools && make clean
diff --git a/uefi-tools/opteed-build.sh b/uefi-tools/opteed-build.sh
index 3c759eb3..94485df8 100755
--- a/uefi-tools/opteed-build.sh
+++ b/uefi-tools/opteed-build.sh
@@ -30,6 +30,9 @@ function build_platform
 		fi
 	fi
 	TOS_PLATFORM_FLAVOR="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_platform_flavor`"
+	if [ X"$TOS_PLATFORM_FLAVOR" = X"" ]; then
+		TOS_PLATFORM_FLAVOR=$TOS_PLATFORM
+	fi
 
 	#
 	# Read platform configuration
diff --git a/uefi-tools/platforms.config b/uefi-tools/platforms.config
index adaf6c03..4a202d14 100644
--- a/uefi-tools/platforms.config
+++ b/uefi-tools/platforms.config
@@ -190,6 +190,8 @@ BUILD_ATF=yes
 ATF_SPD=opteed
 TOS_BIN=tee.bin
 BUILD_TOS=yes
+TOS_PLATFORM=hikey
+TOS_PLATFORM_FLAVOR=hikey
 SCP_BIN=OpenPlatformPkg/Platforms/Hisilicon/HiKey/Binary/mcuimage.bin
 # Uncomment this to use UART0 as the EDK2 console
 #BUILDFLAGS=-DSERIAL_BASE=0xF8015000
-- 
cgit v1.2.3