Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-16 09:34:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge changes from topic "hm/mpam" into integration

Browse source 
* changes:
  fix(build): convert tabs and ifdef comparisons
  fix(build): disable ENABLE_FEAT_MPAM for Aarch32
This commit is contained in:
Manish Pandey 2023-10-31 20:47:19 +01:00 • committed by TrustedFirmware Code Review
commit e8d60a31ad
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
make_helpers/arch_features.mk
View file

@ -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.

1
plat/arm/board/arm_fpga/platform.mk
View file

@ -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

1
plat/arm/board/fvp/platform.mk
View file

@ -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