commit 17cb5becca3972525e53aa36fe9abdb5d5b8d782
author Arthur Heymans <arthur@aheymans.xyz> Mon Jun 14 09:17:49 2021 +0200
committer Patrick Georgi <pgeorgi@google.com> Wed Jun 16 09:52:21 2021 +0000
tree 59ea419a57de16a58ef84ec84bc8305e6c575e92
parent 80ff868020dde82cba7fad9ff51ae3e117cab597

security/tpm/tspi: Reduce scope of tspi_init_crtm

This is only called locally.

Change-Id: Ie3eaf659a2868eee1d4688885495c413f94f42e2
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/55469
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Johnny Lin <Johnny_Lin@wiwynn.com>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Christian Walter <christian.walter@9elements.com>

src/security/tpm/tspi/crtm.c

diff --git a/src/security/tpm/tspi/crtm.c b/src/security/tpm/tspi/crtm.c
index 147fc76..1559838 100644
--- a/src/security/tpm/tspi/crtm.c
+++ b/src/security/tpm/tspi/crtm.c
@@ -46,7 +46,23 @@
 	return 1;
 }
 
-uint32_t tspi_init_crtm(void)
+/*
+ * Initializes the Core Root of Trust for Measurements
+ * in coreboot. The initial code in a chain of trust must measure
+ * itself.
+ *
+ * Summary:
+ *  + Measures the FMAP FMAP partition.
+ *  + Measures bootblock in CBFS or BOOTBLOCK FMAP partition.
+ *  + If vboot starts in romstage, it measures the romstage
+ *    in CBFS.
+ *  + Measure the verstage if it is compiled as separate
+ *    stage.
+ *
+ * Takes the current vboot context as parameter for s3 checks.
+ * returns on success VB2_SUCCESS, else a vboot error.
+ */
+static uint32_t tspi_init_crtm(void)
 {
 	struct prog bootblock = PROG_INIT(PROG_BOOTBLOCK, "bootblock");
 

src/security/tpm/tspi/crtm.h

diff --git a/src/security/tpm/tspi/crtm.h b/src/security/tpm/tspi/crtm.h
index f857ca7..011fa26 100644
--- a/src/security/tpm/tspi/crtm.h
+++ b/src/security/tpm/tspi/crtm.h
@@ -16,24 +16,6 @@
  */
 #define TPM_RUNTIME_DATA_PCR 3
 
-/*
- * Initializes the Core Root of Trust for Measurements
- * in coreboot. The initial code in a chain of trust must measure
- * itself.
- *
- * Summary:
- *  + Measures the FMAP FMAP partition.
- *  + Measures bootblock in CBFS or BOOTBLOCK FMAP partition.
- *  + If vboot starts in romstage, it measures the romstage
- *    in CBFS.
- *  + Measure the verstage if it is compiled as separate
- *    stage.
- *
- * Takes the current vboot context as parameter for s3 checks.
- * returns on success VB2_SUCCESS, else a vboot error.
- */
-uint32_t tspi_init_crtm(void);
-
 /**
  * Measure digests cached in TCPA log entries into PCRs
  */