From d638029ffc67c2767b47c930b0151d6451267b7d Mon Sep 17 00:00:00 2001 From: Govindraj Raja Date: Thu, 12 Oct 2023 16:57:46 -0500 Subject: [PATCH] refactor(build): avoid using values for comparison With changes to refactor to use first platform makefiles then parse arch_features.mk file 'ENABLE_RME' will be initialised only when we define during build or at arch_features.mk thus making comparison of 'ENABLE_RME' to '0' incorrect. So keep BRBE disabled when RME is enabled at main makefile level. Change-Id: I7e3d99eb444678d63585bd5971ada627cfc4fcc9 Signed-off-by: Govindraj Raja --- Makefile | 3 +++ plat/arm/board/fvp/platform.mk | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 417e51276..7f781a09a 100644 --- a/Makefile +++ b/Makefile @@ -623,6 +623,9 @@ endif #(SUPPORT_STACK_MEMTAG) ################################################################################ # FEAT_RME ifeq (${ENABLE_RME},1) + # RME doesn't support BRBE + ENABLE_BRBE_FOR_NS := 0 + # RME doesn't support PIE ifneq (${ENABLE_PIE},0) $(error ENABLE_RME does not support PIE) diff --git a/plat/arm/board/fvp/platform.mk b/plat/arm/board/fvp/platform.mk index 165b1610b..e21a17ee2 100644 --- a/plat/arm/board/fvp/platform.mk +++ b/plat/arm/board/fvp/platform.mk @@ -72,9 +72,7 @@ endif # enable unconditionally for all builds ifeq (${ARCH}, aarch64) -ifeq (${ENABLE_RME},0) - ENABLE_BRBE_FOR_NS := 2 -endif + ENABLE_BRBE_FOR_NS := 2 ENABLE_TRBE_FOR_NS := 2 endif ENABLE_SYS_REG_TRACE_FOR_NS := 2