[L] Change in coreboot[master]: security/tpm: resolve conflicts in TSS implementations

[Sergii Dmytruk (Code Review)]

Attention is currently required from: Jason Glenesk, Raul Rangel, Michał Żygowski, Frans Hendriks, Christian Walter, Julius Werner, Krystian Hebel, Fred Reitberger, Sergii Dmytruk, Felix Held.

Hello Erik van den Bogaert, Jason Glenesk, Raul Rangel, Michał Żygowski, Frans Hendriks, Matt DeVillier, Christian Walter, Julius Werner, Krystian Hebel, Fred Reitberger, Yu-Ping Wu, Felix Held,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/69160

to look at the new patch set (#5).

Change subject: security/tpm: resolve conflicts in TSS implementations
......................................................................

security/tpm: resolve conflicts in TSS implementations

No functional changes.  Just code updates to don't have 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 both TPM device and firmware.

Change-Id: Ia0ea5a917c46ada9fc3274f17240e12bca98db6a
Ticket: https://ticket.coreboot.org/issues/433
Signed-off-by: Sergii Dmytruk 
---
M src/drivers/crb/tis.c
M src/security/tpm/Makefile.inc
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, 454 insertions(+), 279 deletions(-)

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