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

[Sergii Dmytruk (Code Review)]

Attention is currently required from: 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.

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 (#4).

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.

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
A src/security/tpm/tss/tcg-1.2/tss.h
M src/security/tpm/tss/tcg-2.0/tss.c
A src/security/tpm/tss/tcg-2.0/tss.h
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
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, 470 insertions(+), 227 deletions(-)

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