qemu_v8: enable SME for SPMC_AT_EL=2

Hafnium now supports saving/restoring SME state on normal to secure
world switches.
Enable SME on TF-A command line and the platform.

Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
Acked-by: Jerome Forissier <jerome.forissier@linaro.org>
diff --git a/qemu_v8.mk b/qemu_v8.mk
index c19f2b5..be539f0 100644
--- a/qemu_v8.mk
+++ b/qemu_v8.mk
@@ -184,7 +184,6 @@
 TF_A_FLAGS_SPMC_AT_EL_1 += QEMU_TOS_FW_CONFIG_DTS=../build/qemu_v8/spmc_el1_manifest.dts
 TF_A_FLAGS_SPMC_AT_EL_2  = SPD=spmd 
 TF_A_FLAGS_SPMC_AT_EL_2 += ENABLE_SPE_FOR_LOWER_ELS=0
-TF_A_FLAGS_SPMC_AT_EL_2 += ENABLE_SME_FOR_NS=0 ENABLE_SME_FOR_SWD=0
 TF_A_FLAGS_SPMC_AT_EL_2 += ENABLE_FEAT_SEL2=1
 TF_A_FLAGS_SPMC_AT_EL_2 += SP_LAYOUT_FILE=../build/qemu_v8/sp_layout.json
 TF_A_FLAGS_SPMC_AT_EL_2 += NEED_FDT=yes
@@ -514,6 +513,8 @@
 QEMU_SME	= off
 else ifeq ($(SPMC_AT_EL),n)
 QEMU_SME	= on
+else ifeq ($(SPMC_AT_EL),2)
+QEMU_SME	= on
 else
 QEMU_SME	= off
 endif