diff options
| author | Andre Przywara <andre.przywara@arm.com> | 2023-03-21 13:53:19 +0000 |
|---|---|---|
| committer | Manish Pandey <manish.pandey2@arm.com> | 2023-03-27 19:36:00 +0100 |
| commit | d23acc9e4f94d95280ee7985e3f96482eb7fe04d (patch) | |
| tree | fcdaca586dc8781d27b0fc76a5739c66eaea5ed9 /Makefile | |
| parent | 82f5b5098b7674f5b8c6b1e3cd24902b6a508f5a (diff) | |
| download | arm-trusted-firmware-d23acc9e4f94d95280ee7985e3f96482eb7fe04d.tar.gz | |
refactor(amu): unify ENABLE_AMU and ENABLE_FEAT_AMUv1
So far we have the ENABLE_AMU build option to include AMU register
handling code for enabling and context switch. There is also an
ENABLE_FEAT_AMUv1 option, solely to protect the HAFGRTR_EL2 system
register handling. The latter needs some alignment with the new feature
scheme, but it conceptually overlaps with the ENABLE_AMU option.
Since there is no real need for two separate options, unify both into a
new ENABLE_FEAT_AMU name in a first step. This is mostly just renaming at
this point, a subsequent patch will make use of the new feature handling
scheme.
Change-Id: I97d8a55bdee2ed1e1509fa9f2b09fd0bdd82736e
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -1092,7 +1092,6 @@ $(eval $(call assert_booleans,\ DISABLE_MTPMU \ DYN_DISABLE_AUTH \ EL3_EXCEPTION_HANDLING \ - ENABLE_AMU \ ENABLE_AMU_AUXILIARY_COUNTERS \ ENABLE_AMU_FCONF \ AMU_RESTRICT_COUNTERS \ @@ -1172,7 +1171,7 @@ $(eval $(call assert_numerics,\ ENABLE_TRBE_FOR_NS \ ENABLE_BTI \ ENABLE_PAUTH \ - ENABLE_FEAT_AMUv1 \ + ENABLE_FEAT_AMU \ ENABLE_FEAT_AMUv1p1 \ ENABLE_FEAT_CSV2_2 \ ENABLE_FEAT_DIT \ @@ -1229,7 +1228,7 @@ $(eval $(call add_defines,\ CTX_INCLUDE_NEVE_REGS \ DECRYPTION_SUPPORT_${DECRYPTION_SUPPORT} \ DISABLE_MTPMU \ - ENABLE_AMU \ + ENABLE_FEAT_AMU \ ENABLE_AMU_AUXILIARY_COUNTERS \ ENABLE_AMU_FCONF \ AMU_RESTRICT_COUNTERS \ @@ -1310,7 +1309,6 @@ $(eval $(call add_defines,\ ENABLE_MPMM \ ENABLE_MPMM_FCONF \ ENABLE_FEAT_FGT \ - ENABLE_FEAT_AMUv1 \ ENABLE_FEAT_ECV \ SIMICS_BUILD \ ENABLE_FEAT_AMUv1p1 \ |