diff --git a/group/tf-l1-build-fvp/fvp-tbb-mbedtls-romlib-fwu:nil b/group/tf-l1-build-fvp/fvp-tbb-mbedtls-romlib-fwu:nil
new file mode 100644
index 0000000..1bbc737
--- /dev/null
+++ b/group/tf-l1-build-fvp/fvp-tbb-mbedtls-romlib-fwu:nil
@@ -0,0 +1,5 @@
+#
+# 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 41e0b2d..5122931 100755
--- a/script/tf-coverity/tf-cov-make
+++ b/script/tf-coverity/tf-cov-make
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2021, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -163,6 +163,9 @@
 # CoT descriptors in device tree
 clean_build $fvp_common_flags ${ARM_TBB_OPTIONS} COT_DESC_IN_DTB=1 USE_ROMLIB=1
 
+# PSA FWU support
+clean_build $fvp_common_flags ${ARM_TBB_OPTIONS} ARM_GPT_SUPPORT=1 PSA_FWU_SUPPORT=1 USE_ROMLIB=1
+
 #
 # Juno platform
 # We'll use the following flags for all Juno builds.
diff --git a/tf_config/fvp-tbb-mbedtls-romlib-fwu b/tf_config/fvp-tbb-mbedtls-romlib-fwu
new file mode 100644
index 0000000..6979ae0
--- /dev/null
+++ b/tf_config/fvp-tbb-mbedtls-romlib-fwu
@@ -0,0 +1,9 @@
+ARM_GPT_SUPPORT=1
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+PLAT=fvp
+PSA_FWU_SUPPORT=1
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
+USE_ROMLIB=1