]> git.baikalelectronics.ru Git - arm-tf.git/commitdiff
Merge changes from topic "mp/feat_ras" into integration
authorManish Pandey <manish.pandey2@arm.com>
Tue, 9 May 2023 19:48:45 +0000 (21:48 +0200)
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>
Tue, 9 May 2023 19:48:45 +0000 (21:48 +0200)
* changes:
  refactor(cpufeat): enable FEAT_RAS for FEAT_STATE_CHECKED
  refactor(ras): replace RAS_EXTENSION with FEAT_RAS

1  2 
Makefile
docs/getting_started/build-options.rst
lib/el3_runtime/aarch64/context_mgmt.c
make_helpers/defaults.mk
plat/arm/board/fvp/platform.mk

diff --cc Makefile
index e5063deb0ec6f756ce189901ba564b67428fe8b4,edd435c0c7e6c73071f43654f95995040cdee291..1a802447ad325d18d7f8d2c9fef0f43fc627f978
+++ 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,\
Simple merge
Simple merge