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

diff --cc docs/getting_started/build-options.rst
Simple merge

diff --cc plat/qemu/qemu/include/platform_def.h
Simple merge

diff --cc plat/qemu/qemu/platform.mk
index 2cf2b9a983c03fd5a4b09a4e4f3ce02626d5fe6d,cd8c06f19b6fa99b47ebaa988d2e296bd18c8879..4cbce9d04af93e7490909ee5e170c48c2f81c2e5
--- 1/plat/qemu/qemu/platform.mk
--- 2/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