Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ftpm #780

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Ftpm #780

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ff3266
kconfigs/qemu.conf: enabled fTPM
jenswi-linaro Sep 25, 2024
d7edbf0
common.mk: add support for in-tree fTPM
jenswi-linaro Sep 20, 2024
7ea3a0e
[review] common.mk: add support for in-tree fTPM
jenswi-linaro Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions common.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,14 @@ OPTEE_TEST_PATH ?= $(ROOT)/optee_test
OPTEE_EXAMPLES_PATH ?= $(ROOT)/optee_examples
OPTEE_RUST_PATH ?= $(ROOT)/optee_rust
BUILDROOT_TARGET_ROOT ?= $(ROOT)/out-br/target
MS_TPM_20_REF_PATH ?= $(ROOT)/ms-tpm-20-ref

# default high verbosity. slow uarts shall specify lower if prefered
CFG_TEE_CORE_LOG_LEVEL ?= 3

# Only configure with TPM reference source if the directory exists
CFG_MS_TPM_20_REF ?= $(wildcard $(MS_TPM_20_REF_PATH))

# optee_test
WITH_TLS_TESTS ?= y
ifneq ($(COMPILER),clang)
Expand Down Expand Up @@ -271,6 +275,10 @@ ifeq ($(XEN_BOOT),y)
DEFCONFIG_XEN=--br-defconfig build/br-ext/configs/xen.conf
endif

ifneq ($(CFG_MS_TPM_20_REF),y)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess this should be as line 567? I.e.,

ifneq ($(CFG_MS_TPM_20_REF),)

Since the line (47) setting CFG_MS_TPM_20_REF is a path and not y.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, you're right.

DEFCONFIG_TSS ?= --br-defconfig build/br-ext/configs/tss
endif

BR2_PER_PACKAGE_DIRECTORIES ?= y
BR2_PACKAGE_LIBOPENSSL ?= y
BR2_PACKAGE_MMC_UTILS ?= y
Expand Down Expand Up @@ -554,7 +562,12 @@ OPTEE_OS_TA_CROSS_COMPILE_FLAGS += CROSS_COMPILE_ta_rv64="$(CCACHE)$(RISCV64_CRO
OPTEE_OS_TA_CROSS_COMPILE_FLAGS += CROSS_COMPILE_ta_rv32="$(CCACHE)$(RISCV32_CROSS_COMPILE)"
endif

CFG_IN_TREE_EARLY_TAS ?= trusted_keys/f04a0fe7-1f5d-4b9b-abf7-619b85b4ce8c
ifeq ($(CFG_IN_TREE_EARLY_TAS),)
CFG_IN_TREE_EARLY_TAS = trusted_keys/f04a0fe7-1f5d-4b9b-abf7-619b85b4ce8c
ifneq ($(CFG_MS_TPM_20_REF),)
CFG_IN_TREE_EARLY_TAS += ftpm/bc50d971-d4c9-42c4-82cb-343fb7f37896
endif
endif

OPTEE_OS_COMMON_FLAGS ?= \
$(OPTEE_OS_COMMON_EXTRA_FLAGS) \
Expand All @@ -564,7 +577,8 @@ OPTEE_OS_COMMON_FLAGS ?= \
$(OPTEE_OS_TA_CROSS_COMPILE_FLAGS) \
CFG_TEE_CORE_LOG_LEVEL=$(CFG_TEE_CORE_LOG_LEVEL) \
DEBUG=$(DEBUG) \
CFG_IN_TREE_EARLY_TAS="$(CFG_IN_TREE_EARLY_TAS)"
CFG_IN_TREE_EARLY_TAS="$(CFG_IN_TREE_EARLY_TAS)" \
CFG_MS_TPM_20_REF="$(CFG_MS_TPM_20_REF)"

.PHONY: optee-os-common
optee-os-common:
Expand Down
2 changes: 2 additions & 0 deletions kconfigs/qemu.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ CONFIG_KEYS=y
CONFIG_TRUSTED_KEYS=y
CONFIG_ENCRYPTED_KEYS=y
CONFIG_ARM_FFA_TRANSPORT=y
CONFIG_TCG_TPM=y
CONFIG_TCG_FTPM_TEE=y