diff options
-rw-r--r-- | make_helpers/arch_features.mk | 36 | ||||
-rw-r--r-- | plat/arm/board/fvp/platform.mk | 2 |
2 files changed, 19 insertions, 19 deletions
diff --git a/make_helpers/arch_features.mk b/make_helpers/arch_features.mk index f90136b78..28a64c806 100644 --- a/make_helpers/arch_features.mk +++ b/make_helpers/arch_features.mk @@ -182,25 +182,25 @@ ENABLE_SYS_REG_TRACE_FOR_NS ?= 0 # Build option to enable/disable the Statistical Profiling Extension, # keep it enabled by default for AArch64. ifeq (${ARCH},aarch64) - ENABLE_SPE_FOR_NS ?= 2 + ENABLE_SPE_FOR_NS ?= 2 else ifeq (${ARCH},aarch32) - ifdef ENABLE_SPE_FOR_NS - $(error ENABLE_SPE_FOR_NS is not supported for AArch32) - else - ENABLE_SPE_FOR_NS := 0 - endif + ifdef ENABLE_SPE_FOR_NS + $(error ENABLE_SPE_FOR_NS is not supported for AArch32) + else + ENABLE_SPE_FOR_NS := 0 + endif endif # Enable SVE for non-secure world by default. ifeq (${ARCH},aarch64) - ENABLE_SVE_FOR_NS ?= 2 + ENABLE_SVE_FOR_NS ?= 2 # SVE is only supported on AArch64 so disable it on AArch32. else ifeq (${ARCH},aarch32) - ifdef ENABLE_SVE_FOR_NS - $(error ENABLE_SVE_FOR_NS is not supported for AArch32) - else - ENABLE_SVE_FOR_NS := 0 - endif + ifdef ENABLE_SVE_FOR_NS + $(error ENABLE_SVE_FOR_NS is not supported for AArch32) + else + ENABLE_SVE_FOR_NS := 0 + endif endif #---- @@ -291,13 +291,13 @@ ENABLE_SVE_FOR_SWD ?= 0 # Note FEAT_TRBE is only supported on AArch64 - therefore do not enable in # AArch32. ifeq (${ARCH},aarch64) - ENABLE_TRBE_FOR_NS ?= 0 + ENABLE_TRBE_FOR_NS ?= 0 else ifeq (${ARCH},aarch32) - ifdef ENABLE_TRBE_FOR_NS - $(error ENABLE_TRBE_FOR_NS is not supported for AArch32) - else - ENABLE_TRBE_FOR_NS := 0 - endif + ifdef ENABLE_TRBE_FOR_NS + $(error ENABLE_TRBE_FOR_NS is not supported for AArch32) + else + ENABLE_TRBE_FOR_NS := 0 + endif endif #---- diff --git a/plat/arm/board/fvp/platform.mk b/plat/arm/board/fvp/platform.mk index 72f94b0a1..8296c384d 100644 --- a/plat/arm/board/fvp/platform.mk +++ b/plat/arm/board/fvp/platform.mk @@ -75,8 +75,8 @@ ifeq (${ARCH}, aarch64) ifeq (${ENABLE_RME},0) ENABLE_BRBE_FOR_NS := 2 endif + ENABLE_TRBE_FOR_NS := 2 endif -ENABLE_TRBE_FOR_NS := 2 ENABLE_SYS_REG_TRACE_FOR_NS := 2 ENABLE_FEAT_CSV2_2 := 2 ENABLE_FEAT_DIT := 2 |