From d23acc9e4f94d95280ee7985e3f96482eb7fe04d Mon Sep 17 00:00:00 2001 From: Andre Przywara Date: Tue, 21 Mar 2023 13:53:19 +0000 Subject: 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 --- lib/el3_runtime/aarch32/context_mgmt.c | 2 +- lib/el3_runtime/aarch64/context_mgmt.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/el3_runtime') diff --git a/lib/el3_runtime/aarch32/context_mgmt.c b/lib/el3_runtime/aarch32/context_mgmt.c index e7a0e5871..f31ee5dde 100644 --- a/lib/el3_runtime/aarch32/context_mgmt.c +++ b/lib/el3_runtime/aarch32/context_mgmt.c @@ -136,7 +136,7 @@ void cm_setup_context(cpu_context_t *ctx, const entry_point_info_t *ep) static void enable_extensions_nonsecure(bool el2_unused) { #if IMAGE_BL32 -#if ENABLE_AMU +#if ENABLE_FEAT_AMU amu_enable(el2_unused); #endif diff --git a/lib/el3_runtime/aarch64/context_mgmt.c b/lib/el3_runtime/aarch64/context_mgmt.c index 04b685f2d..bb6db9f4d 100644 --- a/lib/el3_runtime/aarch64/context_mgmt.c +++ b/lib/el3_runtime/aarch64/context_mgmt.c @@ -485,7 +485,7 @@ static void manage_extensions_nonsecure(bool el2_unused, cpu_context_t *ctx) spe_enable(el2_unused); } -#if ENABLE_AMU +#if ENABLE_FEAT_AMU amu_enable(el2_unused, ctx); #endif -- cgit v1.2.3