[coreboot-gerrit] Change in coreboot[master]: security/tpm: Move TSS stacks into sub-directory

[Philipp Deppenwiese (Code Review)]

Philipp Deppenwiese has uploaded this change for review. ( https://review.coreboot.org/22105


Change subject: security/tpm: Move TSS stacks into sub-directory
......................................................................

security/tpm: Move TSS stacks into sub-directory

Change-Id: I5e20d98665c17d39f3f69772093a062bb905f6f9
Signed-off-by: Philipp Deppenwiese <zaolin at das-labor.org>
---
M src/security/tpm/Makefile.inc
R src/security/tpm/tss/tcg-1.2/tss.c
R src/security/tpm/tss/tcg-1.2/tss_internal.h
R src/security/tpm/tss/tcg-1.2/tss_structures.h
R src/security/tpm/tss/tcg-2.0/tss.c
R src/security/tpm/tss/tcg-2.0/tss_marshaling.c
R src/security/tpm/tss/tcg-2.0/tss_marshaling.h
R src/security/tpm/tss/tcg-2.0/tss_structures.h
8 files changed, 14 insertions(+), 12 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/05/22105/1

diff --git a/src/security/tpm/Makefile.inc b/src/security/tpm/Makefile.inc
index cfd93c3..2385635 100644
--- a/src/security/tpm/Makefile.inc
+++ b/src/security/tpm/Makefile.inc
@@ -1,12 +1,14 @@
-verstage-$(CONFIG_TPM) += tcg-1.2/tss.c
-verstage-$(CONFIG_TPM2) += tcg-2.0/tss_marshaling.c
-verstage-$(CONFIG_TPM2) += tcg-2.0/tss.c
+## TSS
+
+verstage-$(CONFIG_TPM) += tss/tcg-1.2/tss.c
+verstage-$(CONFIG_TPM2) += tss/tcg-2.0/tss_marshaling.c
+verstage-$(CONFIG_TPM2) += tss/tcg-2.0/tss.c
 
 ifeq ($(CONFIG_VBOOT_SEPARATE_VERSTAGE),y)
-romstage-$(CONFIG_TPM) += tcg-1.2/tss.c
-romstage-$(CONFIG_TPM2) += tcg-2.0/tss_marshaling.c
-romstage-$(CONFIG_TPM2) += tcg-2.0/tss.c
+romstage-$(CONFIG_TPM) += tss/tcg-1.2/tss.c
+romstage-$(CONFIG_TPM2) += tss/tcg-2.0/tss_marshaling.c
+romstage-$(CONFIG_TPM2) += tss/tcg-2.0/tss.c
 endif # CONFIG_VBOOT_SEPARATE_VERSTAGE
 
-ramstage-$(CONFIG_TPM2) += tcg-2.0/tss_marshaling.c
-ramstage-$(CONFIG_TPM2) += tcg-2.0/tss.c
+ramstage-$(CONFIG_TPM2) += tss/tcg-2.0/tss_marshaling.c
+ramstage-$(CONFIG_TPM2) += tss/tcg-2.0/tss.c
diff --git a/src/security/tpm/tcg-1.2/tss.c b/src/security/tpm/tss/tcg-1.2/tss.c
similarity index 99%
rename from src/security/tpm/tcg-1.2/tss.c
rename to src/security/tpm/tss/tcg-1.2/tss.c
index f040847..66de572 100644
--- a/src/security/tpm/tcg-1.2/tss.c
+++ b/src/security/tpm/tss/tcg-1.2/tss.c
@@ -19,9 +19,9 @@
 #include <string.h>
 #include <security/tpm/tddl.h>
 #include <vb2_api.h>
+#include <security/tpm/tss.h>
 #include "tss_internal.h"
 #include "tss_structures.h"
-#include "../tss.h"
 
 #ifdef FOR_TEST
 #include <stdio.h>
diff --git a/src/security/tpm/tcg-1.2/tss_internal.h b/src/security/tpm/tss/tcg-1.2/tss_internal.h
similarity index 100%
rename from src/security/tpm/tcg-1.2/tss_internal.h
rename to src/security/tpm/tss/tcg-1.2/tss_internal.h
diff --git a/src/security/tpm/tcg-1.2/tss_structures.h b/src/security/tpm/tss/tcg-1.2/tss_structures.h
similarity index 100%
rename from src/security/tpm/tcg-1.2/tss_structures.h
rename to src/security/tpm/tss/tcg-1.2/tss_structures.h
diff --git a/src/security/tpm/tcg-2.0/tss.c b/src/security/tpm/tss/tcg-2.0/tss.c
similarity index 99%
rename from src/security/tpm/tcg-2.0/tss.c
rename to src/security/tpm/tss/tcg-2.0/tss.c
index fa76fa5..533fd7e 100644
--- a/src/security/tpm/tcg-2.0/tss.c
+++ b/src/security/tpm/tss/tcg-2.0/tss.c
@@ -9,11 +9,11 @@
 #include <endian.h>
 #include <string.h>
 #include <vb2_api.h>
+#include <security/tpm/tddl.h>
+#include <security/tpm/antirollback.h>
 
 #include "tss_structures.h"
 #include "tss_marshaling.h"
-#include "../tddl.h"
-#include "../antirollback.h"
 
 /*
  * This file provides interface between firmware and TPM2 device. The TPM1.2
diff --git a/src/security/tpm/tcg-2.0/tss_marshaling.c b/src/security/tpm/tss/tcg-2.0/tss_marshaling.c
similarity index 100%
rename from src/security/tpm/tcg-2.0/tss_marshaling.c
rename to src/security/tpm/tss/tcg-2.0/tss_marshaling.c
diff --git a/src/security/tpm/tcg-2.0/tss_marshaling.h b/src/security/tpm/tss/tcg-2.0/tss_marshaling.h
similarity index 100%
rename from src/security/tpm/tcg-2.0/tss_marshaling.h
rename to src/security/tpm/tss/tcg-2.0/tss_marshaling.h
diff --git a/src/security/tpm/tcg-2.0/tss_structures.h b/src/security/tpm/tss/tcg-2.0/tss_structures.h
similarity index 99%
rename from src/security/tpm/tcg-2.0/tss_structures.h
rename to src/security/tpm/tss/tcg-2.0/tss_structures.h
index 389f15d..962e20c 100644
--- a/src/security/tpm/tcg-2.0/tss_structures.h
+++ b/src/security/tpm/tss/tcg-2.0/tss_structures.h
@@ -15,7 +15,7 @@
 #include <compiler.h>
 #include <types.h>
 
-#include "../tss.h"
+#include <security/tpm/tss.h>
 
 /* This should be plenty for what firmware needs. */
 #define TPM_BUFFER_SIZE 256

-- 
To view, visit https://review.coreboot.org/22105
To unsubscribe, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e20d98665c17d39f3f69772093a062bb905f6f9
Gerrit-Change-Number: 22105
Gerrit-PatchSet: 1
Gerrit-Owner: Philipp Deppenwiese <zaolin.daisuki at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20171018/b8a6cf3e/attachment-0001.html>