andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "refactor(measured-boot): cleanup Event Log makefile" into integration

This commit is contained in:
Manish Pandey 2022-02-11 17:57:26 +01:00 committed by TrustedFirmware Code Review
parent 2165f97e88 992d97c45f
commit 2ba3085b8c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/measured_boot/event_log/event_log.mk
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2020-2021, Arm Limited. All rights reserved. # Copyright (c) 2020-2022, Arm Limited. All rights reserved.
# #
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# #
@ -30,10 +30,7 @@ $(eval $(call add_defines,\
EVENT_LOG_LEVEL \ EVENT_LOG_LEVEL \
))) )))
MEASURED_BOOT_SRC_DIR := drivers/measured_boot/event_log/ EVENT_LOG_SRC_DIR := drivers/measured_boot/event_log/
MEASURED_BOOT_SOURCES := ${MEASURED_BOOT_SRC_DIR}event_log.c \ EVENT_LOG_SOURCES := ${EVENT_LOG_SRC_DIR}event_log.c \
${MEASURED_BOOT_SRC_DIR}event_print.c ${EVENT_LOG_SRC_DIR}event_print.c
BL2_SOURCES += ${MEASURED_BOOT_SOURCES}
BL1_SOURCES += ${MEASURED_BOOT_SOURCES}

3
plat/arm/common/arm_common.mk
View File

@ -400,6 +400,9 @@ ifeq (${MEASURED_BOOT},1)
MEASURED_BOOT_MK := drivers/measured_boot/event_log/event_log.mk MEASURED_BOOT_MK := drivers/measured_boot/event_log/event_log.mk
$(info Including ${MEASURED_BOOT_MK}) $(info Including ${MEASURED_BOOT_MK})
include ${MEASURED_BOOT_MK} include ${MEASURED_BOOT_MK}
BL1_SOURCES += ${EVENT_LOG_SOURCES}
BL2_SOURCES += ${EVENT_LOG_SOURCES}
endif endif
ifneq ($(filter 1,${MEASURED_BOOT} ${TRUSTED_BOARD_BOOT}),) ifneq ($(filter 1,${MEASURED_BOOT} ${TRUSTED_BOARD_BOOT}),)