diff options
| author | Olivier Deprez <olivier.deprez@arm.com> | 2022-11-10 17:46:21 +0100 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2022-11-10 17:46:21 +0100 |
| commit | f41e23ea73dcd1cbd6a5239c611da55a3edf2dc3 (patch) | |
| tree | 02f13519adb65b2ff4a2a06a74db4025fecc42b4 /Makefile | |
| parent | 680b7aa9c0eec4176ac58d8235da22d3104cde32 (diff) | |
| parent | 5988a807673c861ea2b14dbedfc9e25e0a9a6d4a (diff) | |
| download | arm-trusted-firmware-f41e23ea73dcd1cbd6a5239c611da55a3edf2dc3.tar.gz | |
Merge changes from topic "mp/ras_refactoring" into integration
* changes:
docs: document do_panic() and panic() helper functions
fix(ras): restrict RAS support for NS world
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -715,8 +715,8 @@ endif # For RAS_EXTENSION, require that EAs are handled in EL3 first ifeq ($(RAS_EXTENSION),1) - ifneq ($(HANDLE_EA_EL3_FIRST),1) - $(error For RAS_EXTENSION, HANDLE_EA_EL3_FIRST must also be 1) + ifneq ($(HANDLE_EA_EL3_FIRST_NS),1) + $(error For RAS_EXTENSION, HANDLE_EA_EL3_FIRST_NS must also be 1) endif endif @@ -1033,7 +1033,7 @@ $(eval $(call assert_booleans,\ FAULT_INJECTION_SUPPORT \ GENERATE_COT \ GICV2_G0_FOR_EL3 \ - HANDLE_EA_EL3_FIRST \ + HANDLE_EA_EL3_FIRST_NS \ HW_ASSISTED_COHERENCY \ INVERTED_MEMMAP \ MEASURED_BOOT \ @@ -1173,7 +1173,7 @@ $(eval $(call add_defines,\ ERROR_DEPRECATED \ FAULT_INJECTION_SUPPORT \ GICV2_G0_FOR_EL3 \ - HANDLE_EA_EL3_FIRST \ + HANDLE_EA_EL3_FIRST_NS \ HW_ASSISTED_COHERENCY \ LOG_LEVEL \ MEASURED_BOOT \ |