From 2fd2fcedff0595a7050328fa60dc4850d6b424bf Mon Sep 17 00:00:00 2001 From: Jayanth Dodderi Chidanand Date: Fri, 28 Apr 2023 15:14:27 +0100 Subject: [PATCH] fix(sme): disable SME for SPD=spmd SPMD is not compatible with ENABLE_SME_FOR_NS. Hence disable SME when SPD=spmd Change-Id: I8bcf2493819718732563f9db69f7186ac7437637 Signed-off-by: Jayanth Dodderi Chidanand --- plat/arm/board/fvp/platform.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plat/arm/board/fvp/platform.mk b/plat/arm/board/fvp/platform.mk index 214064bf1..09878cc13 100644 --- a/plat/arm/board/fvp/platform.mk +++ b/plat/arm/board/fvp/platform.mk @@ -50,7 +50,8 @@ ifneq (${SPD}, tspd) ENABLE_FEAT_RNG := 2 ENABLE_FEAT_TWED := 2 ENABLE_FEAT_GCS := 2 -ifeq (${ARCH},aarch64) +ifeq (${ARCH}, aarch64) +ifneq (${SPD}, spmd) ifeq (${SPM_MM}, 0) ifeq (${ENABLE_RME}, 0) ifeq (${CTX_INCLUDE_FPREGS}, 0) @@ -60,6 +61,7 @@ endif endif endif endif +endif # enable unconditionally for all builds ifeq (${ARCH}, aarch64) -- 2.39.5