diff options
| author | Govindraj Raja <govindraj.raja@arm.com> | 2025-12-04 22:06:30 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2025-12-04 22:06:30 +0000 |
| commit | fd2fb5b7612810ee53ab6bce74dffe955e1f252a (patch) | |
| tree | 78b2439d72b3f513ffc9253eb1ec5be0a14d1062 /Makefile | |
| parent | 2ba920f479aaf6e70495a4f4c674a550b51d2b48 (diff) | |
| parent | 4286d16f0fc3b0b97acb9900726658c1a6968f8c (diff) | |
| download | arm-trusted-firmware-fd2fb5b7612810ee53ab6bce74dffe955e1f252a.tar.gz arm-trusted-firmware-fd2fb5b7612810ee53ab6bce74dffe955e1f252a.zip | |
Merge changes from topic "ar/feat_uinj" into integration
* changes:
feat(cpufeat): add support for FEAT_UINJ
feat(cpufeat): enable mandatory Armv9.4–Armv9.6 features by default
fix(cpufeat): update feature names and comments
fix(cpufeat): simplify AArch32 feature disablement
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -684,6 +684,7 @@ $(eval $(call assert_numerics,\ ENABLE_FEAT_EBEP \ ENABLE_FEAT_FGT \ ENABLE_FEAT_FGT2 \ + ENABLE_FEAT_UINJ \ ENABLE_FEAT_FGWTE3 \ ENABLE_FEAT_FPMR \ ENABLE_FEAT_HCX \ @@ -867,6 +868,7 @@ $(eval $(call add_defines,\ ENABLE_MPMM \ ENABLE_FEAT_FGT \ ENABLE_FEAT_FGT2 \ + ENABLE_FEAT_UINJ \ ENABLE_FEAT_FGWTE3 \ ENABLE_FEAT_FPMR \ ENABLE_FEAT_ECV \ |