From: Olivier Deprez <olivier.deprez@arm.com>
Date: Thu, 15 Dec 2022 13:25:16 +0000 (+0100)
Subject: Merge changes from topic "qemu_sel2" into integration
X-Git-Tag: baikal/aarch64/sdk5.10~1^2~304
X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=6d4f4c3e39cef954ebc6addac24831f6ae9c249a;p=arm-tf.git

Merge changes from topic "qemu_sel2" into integration

* changes:
  docs(build): describes the SPMC_OPTEE build option
  feat(qemu): support el3 spmc
  feat(el3-spmc): make platform logical partition optional
  feat(qemu): support s-el2 spmc
  feat(qemu): update abi between spmd and spmc
  fix(sptool): add dependency to SP image
---

6d4f4c3e39cef954ebc6addac24831f6ae9c249a
diff --cc plat/qemu/qemu/platform.mk
index 2cf2b9a98,cd8c06f19..4cbce9d04
--- a/plat/qemu/qemu/platform.mk
+++ b/plat/qemu/qemu/platform.mk
@@@ -210,14 -212,11 +211,17 @@@ BL31_SOURCES		+=	lib/cpus/aarch64/aem_g
  				${PLAT_QEMU_COMMON_PATH}/qemu_bl31_setup.c		\
  				${QEMU_GIC_SOURCES}
  
 +# Pointer Authentication sources
 +ifeq (${ENABLE_PAUTH}, 1)
 +PLAT_BL_COMMON_SOURCES	+=	plat/arm/common/aarch64/arm_pauth.c	\
 +				lib/extensions/pauth/pauth_helpers.S
 +endif
 +
  ifeq (${SPD},spmd)
- BL31_SOURCES		+=	plat/qemu/common/qemu_spmd_manifest.c
+ BL31_SOURCES		+=	plat/common/plat_spmd_manifest.c	\
+ 				common/uuid.c				\
+ 				${LIBFDT_SRCS} 				\
+ 				${FDT_WRAPPERS_SOURCES}
  endif
  endif