From: Madhukar Pappireddy <madhukar.pappireddy@arm.com>
Date: Tue, 9 May 2023 19:15:54 +0000 (+0200)
Subject: Merge changes from topic "srm/Errata_ABI_El3" into integration
X-Git-Tag: baikal/aarch64/sdk5.10~1^2~26
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=fdf9d768ea0d288aad56e627fda54f881fda606e;p=arm-tf.git

Merge changes from topic "srm/Errata_ABI_El3" into integration

* changes:
  docs(errata_abi): document the errata abi changes
  feat(fvp): enable errata management interface
  fix(cpus): workaround platforms non-arm interconnect
  refactor(errata_abi): factor in non-arm interconnect
  feat(errata_abi): errata management firmware interface
---

fdf9d768ea0d288aad56e627fda54f881fda606e
diff --cc plat/arm/board/fvp/platform.mk
index f2df780c6,363d15d2c..863eb0e65
--- a/plat/arm/board/fvp/platform.mk
+++ b/plat/arm/board/fvp/platform.mk
@@@ -518,9 -513,10 +518,13 @@@ ifeq (${PLATFORM_TEST_EA_FFH}, 1
  BL31_SOURCES	+= plat/arm/board/fvp/aarch64/fvp_ea.c
  endif
  
 -ifeq (${SPD},spmd)
 -BL31_SOURCES	+=	plat/arm/board/fvp/fvp_spmd.c
 +$(eval $(call add_define,PLATFORM_TEST_RAS_FFH))
 +ifeq (${PLATFORM_TEST_RAS_FFH}, 1)
 +    ifeq (${RAS_EXTENSION}, 0)
 +         $(error "PLATFORM_TEST_RAS_FFH expects RAS_EXTENSION to be 1")
 +    endif
  endif
+ 
+ ifeq (${ERRATA_ABI_SUPPORT}, 1)
+ include plat/arm/board/fvp/fvp_cpu_errata.mk
+ endif