diff --git a/patch/fault_inject/ras_kfh_reflection.patch b/patch/fault_inject/ras_kfh_reflection.patch
index cf3afea..546d910 100644
--- a/patch/fault_inject/ras_kfh_reflection.patch
+++ b/patch/fault_inject/ras_kfh_reflection.patch
@@ -1,8 +1,8 @@
-diff --git a/bl31/aarch64/ea_delegate.S b/bl31/aarch64/ea_delegate.S
-index c6790a2f9..c67fa30ee 100644
---- a/bl31/aarch64/ea_delegate.S
-+++ b/bl31/aarch64/ea_delegate.S
-@@ -256,6 +256,14 @@ skip_loop_ctr:
+diff --git a/bl31/aarch64/runtime_exceptions.S b/bl31/aarch64/runtime_exceptions.S
+index 04659da62..56416215b 100644
+--- a/bl31/aarch64/runtime_exceptions.S
++++ b/bl31/aarch64/runtime_exceptions.S
+@@ -696,6 +696,14 @@ subtract_elr_el3:
  	sub	x28, x28, #4
  skip_smc_check:
  	msr	elr_el3, x28
@@ -18,7 +18,7 @@
  	ldr	x30, [sp, #CTX_GPREGS_OFFSET + CTX_GPREG_LR]
  	exception_return
 diff --git a/services/arm_arch_svc/arm_arch_svc_setup.c b/services/arm_arch_svc/arm_arch_svc_setup.c
-index bb042c70e..a4b488005 100644
+index 57d211ed7..7df40e2c2 100644
 --- a/services/arm_arch_svc/arm_arch_svc_setup.c
 +++ b/services/arm_arch_svc/arm_arch_svc_setup.c
 @@ -14,9 +14,30 @@
diff --git a/script/tf-coverity/tf-cov-make b/script/tf-coverity/tf-cov-make
index 48639d1..c51d544 100755
--- a/script/tf-coverity/tf-cov-make
+++ b/script/tf-coverity/tf-cov-make
@@ -164,7 +164,7 @@
 
 # RAS Extension Support
 clean_build $fvp_common_flags EL3_EXCEPTION_HANDLING=1 ENABLE_FEAT_RAS=1 \
-    RAS_FFH_SUPPORT=1 FAULT_INJECTION_SUPPORT=1 HANDLE_EA_EL3_FIRST_NS=1 \
+    FAULT_INJECTION_SUPPORT=1 HANDLE_EA_EL3_FIRST_NS=1 \
     SDEI_SUPPORT=1 PLATFORM_TEST_RAS_FFH=1
 
 # EA handled in EL3 first
@@ -264,7 +264,8 @@
 make $(common_flags) PLAT=rdn2 ${ARM_TBB_OPTIONS} all
 # RAS Extension Support
 make $(common_flags) PLAT=rdn2 ${ARM_TBB_OPTIONS} ENABLE_FEAT_RAS=1 \
-    RAS_FFH_SUPPORT=1 HANDLE_EA_EL3_FIRST_NS=1 SDEI_SUPPORT=1 SPM_MM=1 all
+    HANDLE_EA_EL3_FIRST_NS=1 SDEI_SUPPORT=1 SPM_MM=1 all
+
 # SPMC At EL3 Support
 make $(common_flags) PLAT=rdn2 ${ARM_TBB_OPTIONS} SPMC_AT_EL3=1 SPD=spmd \
     SPMD_SPM_AT_SEL2=0 BL32=1 SPMC_AT_EL3_SEL0_SP=1 EL3_EXCEPTION_HANDLING=1 \
diff --git a/tf_config/fvp-ras-ffh b/tf_config/fvp-ras-ffh
index e0a5581..9804f7a 100644
--- a/tf_config/fvp-ras-ffh
+++ b/tf_config/fvp-ras-ffh
@@ -5,5 +5,4 @@
 HANDLE_EA_EL3_FIRST_NS=1
 PLAT=fvp
 PLATFORM_TEST_RAS_FFH=1
-RAS_FFH_SUPPORT=1
 SDEI_SUPPORT=1
diff --git a/tf_config/fvp-ras-ffh-cc b/tf_config/fvp-ras-ffh-cc
index 9d00ba1..1c3d8cd 100644
--- a/tf_config/fvp-ras-ffh-cc
+++ b/tf_config/fvp-ras-ffh-cc
@@ -5,6 +5,5 @@
 HANDLE_EA_EL3_FIRST_NS=1
 PLAT=fvp
 PLATFORM_TEST_RAS_FFH=1
-RAS_FFH_SUPPORT=1
 SDEI_SUPPORT=1
 ENABLE_ASSERTIONS=0
diff --git a/tf_config/fvp-rdn2-tbb-ras b/tf_config/fvp-rdn2-tbb-ras
index e730f73..5622cc5 100644
--- a/tf_config/fvp-rdn2-tbb-ras
+++ b/tf_config/fvp-rdn2-tbb-ras
@@ -6,7 +6,6 @@
 ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
 TRUSTED_BOARD_BOOT=1
 ENABLE_FEAT_RAS=1
-RAS_FFH_SUPPORT=1
 HANDLE_EA_EL3_FIRST_NS=1
 SDEI_SUPPORT=1
 SPM_MM=1