From 24ab2c0af74be174acf755a36b3ebba867184e60 Mon Sep 17 00:00:00 2001 From: Yann Gautier Date: Fri, 19 Nov 2021 11:35:46 +0100 Subject: [PATCH] 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] dc78e62d80e6 ("feat(sme): enable SME functionality") Change-Id: Ic9c5e2612c9e00bd0d37ca3b59537e39270c9799 Signed-off-by: Yann Gautier --- Makefile | 4 +--- make_helpers/defaults.mk | 4 ++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 32eb501f1..563023123 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/make_helpers/defaults.mk b/make_helpers/defaults.mk index 72f5e3301..551b68977 100644 --- a/make_helpers/defaults.mk +++ b/make_helpers/defaults.mk @@ -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