diff options
author | Philipp Deppenwiese <zaolin@das-labor.org> | 2017-10-18 21:54:24 +0200 |
---|---|---|
committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2018-01-18 02:17:34 +0000 |
commit | 86391f16054ff1aa8af75b552204d24f3c00d50e (patch) | |
tree | 4e27b7d9cbb74227080572d01a449d7b961e2130 /src/security | |
parent | d88fb36e61beac7b52b6183385de4434895a4995 (diff) | |
download | coreboot-86391f16054ff1aa8af75b552204d24f3c00d50e.tar.xz |
security/tpm: Move TSS stacks into sub-directory
Change-Id: I5e20d98665c17d39f3f69772093a062bb905f6f9
Signed-off-by: Philipp Deppenwiese <zaolin@das-labor.org>
Reviewed-on: https://review.coreboot.org/22105
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/security')
-rw-r--r-- | src/security/tpm/Makefile.inc | 18 | ||||
-rw-r--r-- | src/security/tpm/tss/tcg-1.2/tss.c (renamed from src/security/tpm/tcg-1.2/tss.c) | 2 | ||||
-rw-r--r-- | src/security/tpm/tss/tcg-1.2/tss_internal.h (renamed from src/security/tpm/tcg-1.2/tss_internal.h) | 0 | ||||
-rw-r--r-- | src/security/tpm/tss/tcg-1.2/tss_structures.h (renamed from src/security/tpm/tcg-1.2/tss_structures.h) | 0 | ||||
-rw-r--r-- | src/security/tpm/tss/tcg-2.0/tss.c (renamed from src/security/tpm/tcg-2.0/tss.c) | 4 | ||||
-rw-r--r-- | src/security/tpm/tss/tcg-2.0/tss_marshaling.c (renamed from src/security/tpm/tcg-2.0/tss_marshaling.c) | 0 | ||||
-rw-r--r-- | src/security/tpm/tss/tcg-2.0/tss_marshaling.h (renamed from src/security/tpm/tcg-2.0/tss_marshaling.h) | 0 | ||||
-rw-r--r-- | src/security/tpm/tss/tcg-2.0/tss_structures.h (renamed from src/security/tpm/tcg-2.0/tss_structures.h) | 2 |
8 files changed, 14 insertions, 12 deletions
diff --git a/src/security/tpm/Makefile.inc b/src/security/tpm/Makefile.inc index cfd93c3a76..2385635f32 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 index e0ffdea433..b7b2d94930 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/tis.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 index 01912bb78e..01912bb78e 100644 --- a/src/security/tpm/tcg-1.2/tss_internal.h +++ b/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 index 880864ee50..880864ee50 100644 --- a/src/security/tpm/tcg-1.2/tss_structures.h +++ b/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 index ae8625c0b2..cde9ea2946 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/tis.h> +#include <security/tpm/antirollback.h> #include "tss_structures.h" #include "tss_marshaling.h" -#include "../tis.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 index b1d666362b..b1d666362b 100644 --- a/src/security/tpm/tcg-2.0/tss_marshaling.c +++ b/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 index d34756d566..d34756d566 100644 --- a/src/security/tpm/tcg-2.0/tss_marshaling.h +++ b/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 index 389f15df4b..962e20ca8f 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 |