diff options
| author | Harrison Mutai <harrison.mutai@arm.com> | 2026-06-30 15:42:00 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2026-06-30 15:42:00 +0000 |
| commit | 55e1d9beaed61abe77e554bccf03d6cd8a6ee3ea (patch) | |
| tree | 9fe97140011e036123f7820fa0f250429e321ddb /include | |
| parent | 1836963e944169f13a2f7d6947a5b59232c48369 (diff) | |
| parent | 43a605dc8d0f8e0524a92c9153a968f4da5e020a (diff) | |
| download | arm-trusted-firmware-55e1d9beaed61abe77e554bccf03d6cd8a6ee3ea.tar.gz arm-trusted-firmware-55e1d9beaed61abe77e554bccf03d6cd8a6ee3ea.zip | |
Merge "fix(errata-abi): update management of REPORT_ERRATA" into integration
Diffstat (limited to 'include')
| -rw-r--r-- | include/lib/cpus/cpu_ops.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/lib/cpus/cpu_ops.h b/include/lib/cpus/cpu_ops.h index 2e7457e7f..cf910ec29 100644 --- a/include/lib/cpus/cpu_ops.h +++ b/include/lib/cpus/cpu_ops.h @@ -49,22 +49,22 @@ #define CPU_ERRATA_LIST_START_SIZE CPU_WORD_SIZE #define CPU_ERRATA_LIST_END_SIZE CPU_WORD_SIZE + /* Fields required to print errata status */ -#if REPORT_ERRATA +#if (defined(IMAGE_BL31) || defined(IMAGE_BL32)) && REPORT_ERRATA #define CPU_CPU_STR_SIZE CPU_WORD_SIZE -/* BL1 doesn't require mutual exclusion and printed flag. */ -#if defined(IMAGE_BL31) || defined(IMAGE_BL32) #define CPU_ERRATA_LOCK_SIZE CPU_WORD_SIZE #define CPU_ERRATA_PRINTED_SIZE CPU_WORD_SIZE -#else +#elif defined(IMAGE_BL1) && REPORT_ERRATA +/* BL1 doesn't require mutual exclusion and printed flag. */ +#define CPU_CPU_STR_SIZE CPU_WORD_SIZE #define CPU_ERRATA_LOCK_SIZE 0 #define CPU_ERRATA_PRINTED_SIZE 0 -#endif /* defined(IMAGE_BL31) || defined(IMAGE_BL32) */ -#else +#else /* (defined(IMAGE_BL31) || defined(IMAGE_BL32)) && REPORT_ERRATA */ #define CPU_CPU_STR_SIZE 0 #define CPU_ERRATA_LOCK_SIZE 0 #define CPU_ERRATA_PRINTED_SIZE 0 -#endif /* REPORT_ERRATA */ +#endif /* (defined(IMAGE_BL31) || defined(IMAGE_BL32)) && REPORT_ERRATA */ #if defined(IMAGE_BL31) && CRASH_REPORTING #define CPU_REG_DUMP_SIZE CPU_WORD_SIZE |