fix(sve): disable ENABLE_SVE_FOR_NS for AARCH32

With patch [1], ENABLE_SVE_FOR_NS is always enable.
Disable it for AARCH32 platforms, as the feature is not supported.
The warning message is replaced with an error, and the second override
is removed.

[1] dc78e62d80 ("feat(sme): enable SME functionality")

Change-Id: Ic9c5e2612c9e00bd0d37ca3b59537e39270c9799
Signed-off-by: Yann Gautier <yann.gautier@st.com>
This commit is contained in:
Yann Gautier 2021-11-19 11:35:46 +01:00
parent 47833abd77
commit 24ab2c0af7
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