morello: modify the build config
Support for Morello SoC platform has been
added and PLAT_FVP flag has been introduced
to differentiate between the two platforms.
Also, the boot flow has been changed and is now
more aligned to TBBR based one. These changes require
modifications in build config.
Also updated the coverity makefile.
Signed-off-by: Chandni Cherukuri <chandni.cherukuri@arm.com>
Change-Id: I4baa73ee58cf239b047540d7e9a358866e62f0d3
diff --git a/group/tf-l1-build-plat/fvp-morello-default:nil b/group/tf-l1-build-plat/fvp-morello-default:nil
deleted file mode 100644
index d52947d..0000000
--- a/group/tf-l1-build-plat/fvp-morello-default:nil
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2020, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tf-l1-build-plat/fvp-morello-tbb:nil b/group/tf-l1-build-plat/fvp-morello-tbb:nil
new file mode 100644
index 0000000..33f3ae7
--- /dev/null
+++ b/group/tf-l1-build-plat/fvp-morello-tbb:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2021, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/script/tf-coverity/tf-cov-make b/script/tf-coverity/tf-cov-make
index 6ff4e10..aefe31b 100755
--- a/script/tf-coverity/tf-cov-make
+++ b/script/tf-coverity/tf-cov-make
@@ -274,7 +274,7 @@
#
# Morello platform
#
-make $(common_flags) PLAT=morello all
+make $(common_flags) PLAT=morello PLAT_FVP=1 ${ARM_TBB_OPTIONS} all
#
# diphda Platform
diff --git a/tf_config/fvp-morello-default b/tf_config/fvp-morello-default
deleted file mode 100644
index d9218be..0000000
--- a/tf_config/fvp-morello-default
+++ /dev/null
@@ -1,2 +0,0 @@
-CROSS_COMPILE=aarch64-none-elf-
-PLAT=morello
diff --git a/tf_config/fvp-morello-tbb b/tf_config/fvp-morello-tbb
index fd08b5d..ef16bba 100644
--- a/tf_config/fvp-morello-tbb
+++ b/tf_config/fvp-morello-tbb
@@ -3,8 +3,6 @@
CROSS_COMPILE=aarch64-none-elf-
GENERATE_COT=1
PLAT=morello
-ENABLE_MORELLO_CAP=0
-CSS_USE_SCMI_SDS_DRIVER=1
-SCP_BL2=/dev/null
+PLAT_FVP=1
ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
TRUSTED_BOARD_BOOT=1