Merge "fix(sve): disable ENABLE_SVE_FOR_NS for AARCH32" into integration

This commit is contained in:
Madhukar Pappireddy 2021-12-22 23:57:16 +01:00 committed by TrustedFirmware Code Review
commit 91a8bd660a
2 changed files with 5 additions and 3 deletions

View File

@ -794,9 +794,7 @@ ifeq (${ARCH},aarch32)
endif
ifeq (${ENABLE_SVE_FOR_NS},1)
# Warning instead of error due to CI dependency on this
$(warning "ENABLE_SVE_FOR_NS cannot be used with ARCH=aarch32")
$(warning "Forced ENABLE_SVE_FOR_NS=0")
override ENABLE_SVE_FOR_NS := 0
$(error "ENABLE_SVE_FOR_NS cannot be used with ARCH=aarch32")
endif
endif

View File

@ -327,6 +327,10 @@ AMU_RESTRICT_COUNTERS := 0
# Enable SVE for non-secure world by default
ENABLE_SVE_FOR_NS := 1
# SVE is only supported on AArch64 so disable it on AArch32.
ifeq (${ARCH},aarch32)
override ENABLE_SVE_FOR_NS := 0
endif
ENABLE_SVE_FOR_SWD := 0
# SME defaults to disabled