diff options
| author | Bipin Ravi <bipin.ravi@arm.com> | 2022-08-18 22:24:41 +0200 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2022-08-18 22:24:41 +0200 |
| commit | 3a41658864d52b5ade730ec5e4d55aa1bebea622 (patch) | |
| tree | 2a93137da2daf00ef085d49365c5a9935bba9b3a /Makefile | |
| parent | 25c9a4c820e7863cdf81c7b16b60fc0e93cc97bc (diff) | |
| parent | ff86e0b4e6c34d28b8642dd8eb9cbdd517bad195 (diff) | |
| download | arm-trusted-firmware-3a41658864d52b5ade730ec5e4d55aa1bebea622.tar.gz | |
Merge "feat(rng-trap): add EL3 support for FEAT_RNG_TRAP" into integration
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -794,11 +794,15 @@ ifeq (${ARCH},aarch32) $(error "ENABLE_SVE_FOR_NS cannot be used with ARCH=aarch32") endif - # BRBE is not supported in Aarch32 + # BRBE is not supported in AArch32 ifeq (${ENABLE_BRBE_FOR_NS},1) $(error "ENABLE_BRBE_FOR_NS cannot be used with ARCH=aarch32") endif + # FEAT_RNG_TRAP is not supported in AArch32 + ifeq (${ENABLE_FEAT_RNG_TRAP},1) + $(error "ENABLE_FEAT_RNG_TRAP cannot be used with ARCH=aarch32") + endif endif # Ensure ENABLE_RME is not used with SME @@ -1079,6 +1083,7 @@ $(eval $(call assert_numerics,\ ENABLE_FEAT_HCX \ ENABLE_FEAT_PAN \ ENABLE_FEAT_RNG \ + ENABLE_FEAT_RNG_TRAP \ ENABLE_FEAT_SB \ ENABLE_FEAT_SEL2 \ ENABLE_FEAT_VHE \ @@ -1190,6 +1195,7 @@ $(eval $(call add_defines,\ COT_DESC_IN_DTB \ USE_SP804_TIMER \ ENABLE_FEAT_RNG \ + ENABLE_FEAT_RNG_TRAP \ ENABLE_FEAT_SB \ ENABLE_FEAT_DIT \ NR_OF_FW_BANKS \ |