summaryrefslogtreecommitdiff
path: root/bl31
diff options
context:
space:
mode:
authorManish Pandey <manish.pandey2@arm.com>2023-01-19 18:19:50 +0100
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2023-01-19 18:19:50 +0100
commit344e5e8149f98fcbb2360cabc1dfc99db210ef82 (patch)
treeca911d4700d2e0604961aef4916f9734cd9ee446 /bl31
parent96df1f1db6e824cd3802dd7bcf245359e779cfcb (diff)
parent2e1241888ee82a5a9b3b30acd83a1f4ea6732f1b (diff)
downloadarm-trusted-firmware-344e5e8149f98fcbb2360cabc1dfc99db210ef82.tar.gz
Merge changes from topic "feat_state_rework" into integration
* changes: feat(fvp): enable FEAT_HCX by default refactor(context-mgmt): move FEAT_HCX save/restore into C refactor(cpufeat): convert FEAT_HCX to new scheme feat(fvp): enable FEAT_FGT by default refactor(context-mgmt): move FEAT_FGT save/restore code into C refactor(amu): convert FEAT_AMUv1 to new scheme refactor(cpufeat): decouple FGT feature detection and build flags refactor(cpufeat): check FEAT_FGT in a new way refactor(cpufeat): move helpers into .c file, rename FEAT_STATE_ feat(aarch64): make ID system register reads non-volatile
Diffstat (limited to 'bl31')
-rw-r--r--bl31/bl31_main.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/bl31/bl31_main.c b/bl31/bl31_main.c
index 2a3d838e4..e70eb5584 100644
--- a/bl31/bl31_main.c
+++ b/bl31/bl31_main.c
@@ -93,15 +93,6 @@ void bl31_setup(u_register_t arg0, u_register_t arg1, u_register_t arg2,
/* Perform late platform-specific setup */
bl31_plat_arch_setup();
-#if ENABLE_FEAT_HCX
- /*
- * Assert that FEAT_HCX is supported on this system, without this check
- * an exception would occur during context save/restore if enabled but
- * not supported.
- */
- assert(is_feat_hcx_present());
-#endif /* ENABLE_FEAT_HCX */
-
#if CTX_INCLUDE_PAUTH_REGS
/*
* Assert that the ARMv8.3-PAuth registers are present or an access