commit 677bc341677bb71508bb8c004c4fcfe71488371e
author Yann Gautier <yann.gautier@st.com> Tue Apr 23 10:42:01 2024 +0200
committer TrustedFirmware Code Review <review@review.trustedfirmware.org> Tue Apr 23 10:42:01 2024 +0200
tree 829379ac3205842c163cedd0c499b899e9264146
parent b14c92a4575b6177d81f02c6e6f449e49c9bb18a
parent 2a82ca6ed967ab13fa16ee011b3e046be99f3135

Merge "feat(qemu): allow ARM_ARCH_MAJOR/MINOR override" into integration

plat/qemu/common/common.mk

diff --git a/plat/qemu/common/common.mk b/plat/qemu/common/common.mk
index 8142599..ed95bc6 100644
--- a/plat/qemu/common/common.mk
+++ b/plat/qemu/common/common.mk
@@ -88,8 +88,8 @@
 #
 # We go v8.0 by default and will enable all features we want
 
-ARM_ARCH_MAJOR		:=	8
-ARM_ARCH_MINOR		:=	0
+ARM_ARCH_MAJOR		?=	8
+ARM_ARCH_MINOR		?=	0
 
 # 8.0
 ENABLE_FEAT_CSV2_2	:=	2
@@ -106,6 +106,7 @@
 # 8.4
 ENABLE_FEAT_SEL2	:=	2
 ENABLE_FEAT_DIT		:=	2
+ENABLE_TRF_FOR_NS	:=	2
 
 # 8.5
 ENABLE_FEAT_RNG		:=	2