<p>Philipp Deppenwiese has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/22105">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">security/tpm: Move TSS stacks into sub-directory<br><br>Change-Id: I5e20d98665c17d39f3f69772093a062bb905f6f9<br>Signed-off-by: Philipp Deppenwiese <zaolin@das-labor.org><br>---<br>M src/security/tpm/Makefile.inc<br>R src/security/tpm/tss/tcg-1.2/tss.c<br>R src/security/tpm/tss/tcg-1.2/tss_internal.h<br>R src/security/tpm/tss/tcg-1.2/tss_structures.h<br>R src/security/tpm/tss/tcg-2.0/tss.c<br>R src/security/tpm/tss/tcg-2.0/tss_marshaling.c<br>R src/security/tpm/tss/tcg-2.0/tss_marshaling.h<br>R src/security/tpm/tss/tcg-2.0/tss_structures.h<br>8 files changed, 14 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/05/22105/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/security/tpm/Makefile.inc b/src/security/tpm/Makefile.inc<br>index cfd93c3..2385635 100644<br>--- a/src/security/tpm/Makefile.inc<br>+++ b/src/security/tpm/Makefile.inc<br>@@ -1,12 +1,14 @@<br>-verstage-$(CONFIG_TPM) += tcg-1.2/tss.c<br>-verstage-$(CONFIG_TPM2) += tcg-2.0/tss_marshaling.c<br>-verstage-$(CONFIG_TPM2) += tcg-2.0/tss.c<br>+## TSS<br>+<br>+verstage-$(CONFIG_TPM) += tss/tcg-1.2/tss.c<br>+verstage-$(CONFIG_TPM2) += tss/tcg-2.0/tss_marshaling.c<br>+verstage-$(CONFIG_TPM2) += tss/tcg-2.0/tss.c<br> <br> ifeq ($(CONFIG_VBOOT_SEPARATE_VERSTAGE),y)<br>-romstage-$(CONFIG_TPM) += tcg-1.2/tss.c<br>-romstage-$(CONFIG_TPM2) += tcg-2.0/tss_marshaling.c<br>-romstage-$(CONFIG_TPM2) += tcg-2.0/tss.c<br>+romstage-$(CONFIG_TPM) += tss/tcg-1.2/tss.c<br>+romstage-$(CONFIG_TPM2) += tss/tcg-2.0/tss_marshaling.c<br>+romstage-$(CONFIG_TPM2) += tss/tcg-2.0/tss.c<br> endif # CONFIG_VBOOT_SEPARATE_VERSTAGE<br> <br>-ramstage-$(CONFIG_TPM2) += tcg-2.0/tss_marshaling.c<br>-ramstage-$(CONFIG_TPM2) += tcg-2.0/tss.c<br>+ramstage-$(CONFIG_TPM2) += tss/tcg-2.0/tss_marshaling.c<br>+ramstage-$(CONFIG_TPM2) += tss/tcg-2.0/tss.c<br>diff --git a/src/security/tpm/tcg-1.2/tss.c b/src/security/tpm/tss/tcg-1.2/tss.c<br>similarity index 99%<br>rename from src/security/tpm/tcg-1.2/tss.c<br>rename to src/security/tpm/tss/tcg-1.2/tss.c<br>index f040847..66de572 100644<br>--- a/src/security/tpm/tcg-1.2/tss.c<br>+++ b/src/security/tpm/tss/tcg-1.2/tss.c<br>@@ -19,9 +19,9 @@<br> #include <string.h><br> #include <security/tpm/tddl.h><br> #include <vb2_api.h><br>+#include <security/tpm/tss.h><br> #include "tss_internal.h"<br> #include "tss_structures.h"<br>-#include "../tss.h"<br> <br> #ifdef FOR_TEST<br> #include <stdio.h><br>diff --git a/src/security/tpm/tcg-1.2/tss_internal.h b/src/security/tpm/tss/tcg-1.2/tss_internal.h<br>similarity index 100%<br>rename from src/security/tpm/tcg-1.2/tss_internal.h<br>rename to src/security/tpm/tss/tcg-1.2/tss_internal.h<br>diff --git a/src/security/tpm/tcg-1.2/tss_structures.h b/src/security/tpm/tss/tcg-1.2/tss_structures.h<br>similarity index 100%<br>rename from src/security/tpm/tcg-1.2/tss_structures.h<br>rename to src/security/tpm/tss/tcg-1.2/tss_structures.h<br>diff --git a/src/security/tpm/tcg-2.0/tss.c b/src/security/tpm/tss/tcg-2.0/tss.c<br>similarity index 99%<br>rename from src/security/tpm/tcg-2.0/tss.c<br>rename to src/security/tpm/tss/tcg-2.0/tss.c<br>index fa76fa5..533fd7e 100644<br>--- a/src/security/tpm/tcg-2.0/tss.c<br>+++ b/src/security/tpm/tss/tcg-2.0/tss.c<br>@@ -9,11 +9,11 @@<br> #include <endian.h><br> #include <string.h><br> #include <vb2_api.h><br>+#include <security/tpm/tddl.h><br>+#include <security/tpm/antirollback.h><br> <br> #include "tss_structures.h"<br> #include "tss_marshaling.h"<br>-#include "../tddl.h"<br>-#include "../antirollback.h"<br> <br> /*<br>  * This file provides interface between firmware and TPM2 device. The TPM1.2<br>diff --git a/src/security/tpm/tcg-2.0/tss_marshaling.c b/src/security/tpm/tss/tcg-2.0/tss_marshaling.c<br>similarity index 100%<br>rename from src/security/tpm/tcg-2.0/tss_marshaling.c<br>rename to src/security/tpm/tss/tcg-2.0/tss_marshaling.c<br>diff --git a/src/security/tpm/tcg-2.0/tss_marshaling.h b/src/security/tpm/tss/tcg-2.0/tss_marshaling.h<br>similarity index 100%<br>rename from src/security/tpm/tcg-2.0/tss_marshaling.h<br>rename to src/security/tpm/tss/tcg-2.0/tss_marshaling.h<br>diff --git a/src/security/tpm/tcg-2.0/tss_structures.h b/src/security/tpm/tss/tcg-2.0/tss_structures.h<br>similarity index 99%<br>rename from src/security/tpm/tcg-2.0/tss_structures.h<br>rename to src/security/tpm/tss/tcg-2.0/tss_structures.h<br>index 389f15d..962e20c 100644<br>--- a/src/security/tpm/tcg-2.0/tss_structures.h<br>+++ b/src/security/tpm/tss/tcg-2.0/tss_structures.h<br>@@ -15,7 +15,7 @@<br> #include <compiler.h><br> #include <types.h><br> <br>-#include "../tss.h"<br>+#include <security/tpm/tss.h><br> <br> /* This should be plenty for what firmware needs. */<br> #define TPM_BUFFER_SIZE 256<br></pre><p>To view, visit <a href="https://review.coreboot.org/22105">change 22105</a>. To unsubscribe, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/22105"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I5e20d98665c17d39f3f69772093a062bb905f6f9 </div>
<div style="display:none"> Gerrit-Change-Number: 22105 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Philipp Deppenwiese <zaolin.daisuki@gmail.com> </div>