Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-19 02:54:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "Select the Log Level for the Event Log Dump on Measured Boot at build time." into integration

Browse source
This commit is contained in:
Alexei Fedorov 2020-09-24 10:11:21 +00:00 • committed by TrustedFirmware Code Review
commit 901f55f182
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/getting_started/build-options.rst
View file

@ -300,6 +300,10 @@ Common build options
handled at EL3, and a panic will result. This is supported only for AArch64 handled at EL3, and a panic will result. This is supported only for AArch64
builds. builds.
- ``EVENT_LOG_LEVEL``: Chooses the log level to use for Measured Boot when
``MEASURED_BOOT`` is enabled. For a list of valid values, see ``LOG_LEVEL``.
Default value is 40 (LOG_LEVEL_INFO).
- ``FAULT_INJECTION_SUPPORT``: ARMv8.4 extensions introduced support for fault - ``FAULT_INJECTION_SUPPORT``: ARMv8.4 extensions introduced support for fault
injection from lower ELs, and this build option enables lower ELs to use injection from lower ELs, and this build option enables lower ELs to use
Error Records accessed via System Registers to inject faults. This is Error Records accessed via System Registers to inject faults. This is

4
drivers/measured_boot/measured_boot.mk
View file

@ -4,6 +4,9 @@
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# #
# Default log level to dump the event log (LOG_LEVEL_INFO)
EVENT_LOG_LEVEL ?= 40
# TPM hash algorithm # TPM hash algorithm
TPM_HASH_ALG := sha256 TPM_HASH_ALG := sha256
@ -31,6 +34,7 @@ $(eval $(call add_defines,\
TPM_ALG_ID \ TPM_ALG_ID \
TCG_DIGEST_SIZE \ TCG_DIGEST_SIZE \
EVENT_LOG_SIZE \ EVENT_LOG_SIZE \
EVENT_LOG_LEVEL \
))) )))
ifeq (${HASH_ALG}, sha256) ifeq (${HASH_ALG}, sha256)

2
include/drivers/measured_boot/event_log.h
View file

@ -20,8 +20,6 @@
* LOG_LEVEL_WARNING * LOG_LEVEL_WARNING
* LOG_LEVEL_VERBOSE * LOG_LEVEL_VERBOSE
*/ */
#define EVENT_LOG_LEVEL LOG_LEVEL_INFO
#if EVENT_LOG_LEVEL == LOG_LEVEL_ERROR #if EVENT_LOG_LEVEL == LOG_LEVEL_ERROR
#define LOG_EVENT ERROR #define LOG_EVENT ERROR
#elif EVENT_LOG_LEVEL == LOG_LEVEL_NOTICE #elif EVENT_LOG_LEVEL == LOG_LEVEL_NOTICE