diff options
| author | Manish Pandey <manish.pandey2@arm.com> | 2023-10-31 20:47:19 +0100 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2023-10-31 20:47:19 +0100 |
| commit | e8d60a31ad427a25344013ff20f01550fa071239 (patch) | |
| tree | 4583293aa3b7cf2ede34e71a3a4b3a479130c3a2 | |
| parent | 6cc9495822bfb60fbaf8243c5a626b3c5e5dbbf0 (diff) | |
| parent | 72f027c335a9e20e479e0d684132401546685616 (diff) | |
Merge changes from topic "hm/mpam" into integration
* changes:
fix(build): convert tabs and ifdef comparisons
fix(build): disable ENABLE_FEAT_MPAM for Aarch32
| -rw-r--r-- | make_helpers/arch_features.mk | 12 | ||||
| -rw-r--r-- | plat/arm/board/arm_fpga/platform.mk | 1 | ||||
| -rw-r--r-- | plat/arm/board/fvp/platform.mk | 1 |
3 files changed, 6 insertions, 8 deletions
diff --git a/make_helpers/arch_features.mk b/make_helpers/arch_features.mk index f957f0ddb..a337e7675 100644 --- a/make_helpers/arch_features.mk +++ b/make_helpers/arch_features.mk @@ -217,13 +217,13 @@ AMU_RESTRICT_COUNTERS ?= 0 # Build option to enable MPAM for lower ELs. # Enabling it by default ifeq (${ARCH},aarch64) - ENABLE_FEAT_MPAM ?= 2 + ENABLE_FEAT_MPAM ?= 2 else ifeq (${ARCH},aarch32) - ifdef ENABLE_FEAT_MPAM - $(error ENABLE_FEAT_MPAM is not supported for AArch32) - else - ENABLE_FEAT_MPAM := 0 - endif + ifneq ($(or $(ENABLE_FEAT_MPAM),0),0) + $(error ENABLE_FEAT_MPAM is not supported for AArch32) + else + ENABLE_FEAT_MPAM := 0 + endif endif # Include nested virtualization control (Armv8.4-NV) registers in cpu context. diff --git a/plat/arm/board/arm_fpga/platform.mk b/plat/arm/board/arm_fpga/platform.mk index c71c99a21..f44b37d4a 100644 --- a/plat/arm/board/arm_fpga/platform.mk +++ b/plat/arm/board/arm_fpga/platform.mk @@ -41,7 +41,6 @@ ENABLE_FEAT_CSV2_2 := 2 ENABLE_FEAT_ECV := 2 ENABLE_FEAT_FGT := 2 ENABLE_FEAT_HCX := 2 -ENABLE_FEAT_MPAM := 2 ENABLE_SYS_REG_TRACE_FOR_NS := 2 ENABLE_TRF_FOR_NS := 2 diff --git a/plat/arm/board/fvp/platform.mk b/plat/arm/board/fvp/platform.mk index 9eb66598a..f7c174f78 100644 --- a/plat/arm/board/fvp/platform.mk +++ b/plat/arm/board/fvp/platform.mk @@ -53,7 +53,6 @@ ifneq (${SPD}, tspd) ENABLE_FEAT_AMU := 2 ENABLE_FEAT_AMUv1p1 := 2 ENABLE_FEAT_HCX := 2 - ENABLE_FEAT_MPAM := 2 ENABLE_FEAT_RNG := 2 ENABLE_FEAT_TWED := 2 ENABLE_FEAT_GCS := 2 |