commit 036c08df52c8c19085f2906189a743d2937f97ea
author Tamas Ban <tamas.ban@arm.com> Thu Oct 10 18:03:37 2024 +0200
committer Manish V Badarkhe <manish.badarkhe@arm.com> Mon Oct 14 15:05:59 2024 +0200
tree 9359e329797577ddf5ad07580991b6e23c40a4db
parent 3836c6d5cf423f3774fa1ed2a91dc64465390ed5

chore(tc): add QCBOR dependency unconditionally

The following configs rely on QCBOR:
 - DICE_PROTECTION_ENVIRONMENT=1
 - PLATFORM_TEST=tfm-testsuite

Add it unconditionally to simplify the build.

Change-Id: I7b6a17809d00a4961e3aea4974550451c1732eb4
Signed-off-by: Tamas Ban <tamas.ban@arm.com>

run_config/fvp-linux.tc

diff --git a/run_config/fvp-linux.tc b/run_config/fvp-linux.tc
index 11b116e..f703379 100644
--- a/run_config/fvp-linux.tc
+++ b/run_config/fvp-linux.tc
@@ -48,22 +48,20 @@
 	local qcbor_release_archive="qcbor-v1_2.tar.gz"
 	local qcbor_folder="qcbor"
 
-	if [ "$(get_tf_opt DICE_PROTECTION_ENVIRONMENT)" = 1 ]; then
-		pushd "$workspace"
+	pushd "$workspace"
 
-		if [ ! -d "qcbor" ]; then
-			saveas="${qcbor_release_archive}" \
-				url="https://github.com/laurencelundblade/QCBOR/archive/refs/tags/v1.2.tar.gz" \
-				fetch_file
-			mkdir $qcbor_folder
-			tar -xzf "${qcbor_release_archive}" --directory=$qcbor_folder --strip-component=1
-		fi
-
-		echo "Set QCBOR_DIR to $workspace/qcbor"
-		set_hook_var "QCBOR_DIR" "$workspace/qcbor"
-
-		popd "$workspace"
+	if [ ! -d "qcbor" ]; then
+		saveas="${qcbor_release_archive}" \
+			url="https://github.com/laurencelundblade/QCBOR/archive/refs/tags/v1.2.tar.gz" \
+			fetch_file
+		mkdir $qcbor_folder
+		tar -xzf "${qcbor_release_archive}" --directory=$qcbor_folder --strip-component=1
 	fi
+
+	echo "Set QCBOR_DIR to $workspace/qcbor"
+	set_hook_var "QCBOR_DIR" "$workspace/qcbor"
+
+	popd "$workspace"
 }
 
 generate_lava_job_template() {

script/tf-coverity/tf-cov-make

diff --git a/script/tf-coverity/tf-cov-make b/script/tf-coverity/tf-cov-make
index 6b48e50..289a4e6 100755
--- a/script/tf-coverity/tf-cov-make
+++ b/script/tf-coverity/tf-cov-make
@@ -356,13 +356,13 @@
     DICE_PROTECTION_ENVIRONMENT=1 QCBOR_DIR=$(pwd)/qcbor
 clean_build $(common_flags) PLAT=tc TARGET_PLATFORM=2 ${ARM_TBB_OPTIONS} PLATFORM_TEST=rse-nv-counters
 clean_build $(common_flags) PLAT=tc TARGET_PLATFORM=2 ${ARM_TBB_OPTIONS} PLATFORM_TEST=tfm-testsuite \
-    MEASURED_BOOT=1 TF_M_TESTS_PATH=$(pwd)/../tf-m-tests TF_M_EXTRAS_PATH=$(pwd)/../tf-m-extras
+    MEASURED_BOOT=1  QCBOR_DIR=$(pwd)/qcbor TF_M_TESTS_PATH=$(pwd)/../tf-m-tests TF_M_EXTRAS_PATH=$(pwd)/../tf-m-extras
 clean_build $(common_flags) PLAT=tc TARGET_PLATFORM=3 ${ARM_TBB_OPTIONS} \
     PLAT_MHU_VERSION=3
 clean_build $(common_flags) PLAT=tc TARGET_PLATFORM=3 ${ARM_TBB_OPTIONS} PLATFORM_TEST=rse-rotpk
 clean_build $(common_flags) PLAT=tc TARGET_PLATFORM=3 ${ARM_TBB_OPTIONS} PLATFORM_TEST=rse-nv-counters
 clean_build $(common_flags) PLAT=tc TARGET_PLATFORM=3 ${ARM_TBB_OPTIONS} PLATFORM_TEST=tfm-testsuite \
-    TF_M_TESTS_PATH=$(pwd)/../tf-m-tests TF_M_EXTRAS_PATH=$(pwd)/../tf-m-extras
+     QCBOR_DIR=$(pwd)/qcbor TF_M_TESTS_PATH=$(pwd)/../tf-m-tests TF_M_EXTRAS_PATH=$(pwd)/../tf-m-extras
 clean_build $(common_flags) PLAT=tc TARGET_PLATFORM=4 ${ARM_TBB_OPTIONS} \
     PLAT_MHU_VERSION=3