diff options
| author | Olivier Deprez <olivier.deprez@arm.com> | 2022-04-22 21:09:13 +0200 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2022-04-22 21:09:13 +0200 |
| commit | 65b13bace4b92f9384e712cd1631f59f0da747c5 (patch) | |
| tree | 2d6592f85529ade7687155d76c8b974d474d89e9 /Makefile | |
| parent | 115748b2090c27286209f32bb8210030aa3ac80d (diff) | |
| parent | 9741327df577c3f43db42b26bda607429e62af0b (diff) | |
| download | arm-trusted-firmware-65b13bace4b92f9384e712cd1631f59f0da747c5.tar.gz | |
Merge changes from topic "ffa_el3_spmc" into integration
* changes:
feat(spmc): add support for direct req/resp
feat(spmc): add support for handling FFA_ERROR ABI
feat(spmc): add support for FFA_MSG_WAIT
feat(spmc): add function to determine the return path from the SPMC
feat(spmd): enable handling of FF-A SMCs with the SPMC at EL3
feat(spmd): update SPMC init flow to use EL3 implementation
feat(spmc): add FF-A secure partition manager core
feat(spmc): prevent read only xlat tables with the EL3 SPMC
feat(spmc): enable building of the SPMC at EL3
refactor(spm_mm): reorganize secure partition manager code
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -523,6 +523,9 @@ ifneq (${SPD},none) ifeq ($(CTX_INCLUDE_EL2_REGS),0) $(error SPMD with SPM at S-EL2 requires CTX_INCLUDE_EL2_REGS option) endif + ifeq ($(SPMC_AT_EL3),1) + $(error SPM cannot be enabled in both S-EL2 and EL3.) + endif endif ifeq ($(findstring optee_sp,$(ARM_SPMC_MANIFEST_DTS)),optee_sp) @@ -573,6 +576,9 @@ ifneq (${ENABLE_RME},0) ifneq (${ARCH},aarch64) $(error ENABLE_RME requires AArch64) endif +ifeq ($(SPMC_AT_EL3),1) + $(error SPMC_AT_EL3 and ENABLE_RME cannot both be enabled.) +endif include services/std_svc/rmmd/rmmd.mk $(warning "RME is an experimental feature") endif @@ -1002,6 +1008,7 @@ $(eval $(call assert_booleans,\ SEPARATE_NOBITS_REGION \ SPIN_ON_BL1_EXIT \ SPM_MM \ + SPMC_AT_EL3 \ SPMD_SPM_AT_SEL2 \ TRUSTED_BOARD_BOOT \ CRYPTO_SUPPORT \ @@ -1134,6 +1141,7 @@ $(eval $(call add_defines,\ SPD_${SPD} \ SPIN_ON_BL1_EXIT \ SPM_MM \ + SPMC_AT_EL3 \ SPMD_SPM_AT_SEL2 \ TRUSTED_BOARD_BOOT \ CRYPTO_SUPPORT \ |