Attention is currently required from: Christian Walter, Felix Held, Frans Hendriks, Fred Reitberger, Jason Glenesk, Krystian Hebel, Matt DeVillier, Michał Żygowski, Raul Rangel, Sergii Dmytruk, Yu-Ping Wu.

Sergii Dmytruk uploaded patch set #29 to this change.

View Change

The following approvals got outdated and were removed: Verified+1 by build bot (Jenkins)

security/tpm: resolve conflicts in TSS implementations

No functional changes.  Refactor code such that there won't be any
compiler or linker errors if TSS 1.2 and TSS 2.0 were both compiled
in.  One might want to support both TPM families for example if TPM
is pluggable, in which case currently one has to update firmware along
with switching TPM device.

Change-Id: Ia0ea5a917c46ada9fc3274f17240e12bca98db6a
Ticket: https://ticket.coreboot.org/issues/433
Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
---
M src/drivers/crb/tis.c
M src/security/tpm/Makefile.mk
M src/security/tpm/tspi/tspi.c
M src/security/tpm/tss.h
M src/security/tpm/tss/tcg-1.2/tss.c
M src/security/tpm/tss/tcg-2.0/tss.c
M src/security/tpm/tss/tcg-2.0/tss_marshaling.c
A src/security/tpm/tss/tss.c
M src/security/tpm/tss/vendor/cr50/cr50.c
A src/security/tpm/tss1.h
A src/security/tpm/tss2.h
M src/security/vboot/secdata_tpm.c
M src/soc/amd/common/psp_verstage/psp_verstage.c
M src/vendorcode/eltan/security/mboot/mboot.c
M src/vendorcode/google/chromeos/tpm2.c
15 files changed, 408 insertions(+), 295 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/60/69160/29

To view, visit change 69160. To unsubscribe, or for help writing mail filters, visit settings.