From: Manish Pandey <manish.pandey2@arm.com>
Date: Tue, 9 May 2023 19:48:45 +0000 (+0200)
Subject: Merge changes from topic "mp/feat_ras" into integration
X-Git-Tag: baikal/aarch64/sdk5.10~1^2~25
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=269f3daefbfeb07904bacf7982a2105aa6275761;p=arm-tf.git

Merge changes from topic "mp/feat_ras" into integration

* changes:
  refactor(cpufeat): enable FEAT_RAS for FEAT_STATE_CHECKED
  refactor(ras): replace RAS_EXTENSION with FEAT_RAS
---

269f3daefbfeb07904bacf7982a2105aa6275761
diff --cc Makefile
index e5063deb0,edd435c0c..1a802447a
--- a/Makefile
+++ b/Makefile
@@@ -1177,9 -1174,8 +1183,10 @@@ $(eval $(call assert_booleans,
          SIMICS_BUILD \
          FEATURE_DETECTION \
  	TRNG_SUPPORT \
 +	ERRATA_ABI_SUPPORT \
 +	ERRATA_NON_ARM_INTERCONNECT \
  	CONDITIONAL_CMO \
+ 	RAS_FFH_SUPPORT \
  )))
  
  $(eval $(call assert_numerics,\