summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShelley Chen <shchen@google.com>2020-10-16 10:55:07 -0700
committerPatrick Georgi <pgeorgi@google.com>2020-10-19 07:01:04 +0000
commitd5faa90df50c820ed3b79d4a5e479767efd73287 (patch)
treed13f7478d50924b5c653532243a2bedcbe285696
parentdc667980f8ab78296e77b53d4afd1ce8d21dd2a6 (diff)
security/vboot: Rename mem_init.h to mrc_cache_hash_tpm.h
As ongoing work for generalizing mrc_cache to be used by all platforms, we are pulling it out from fsp 2.0 and renaming it as mrc_cache_hash_tpm.h in security/vboot. BUG=b:150502246 BRANCH=None TEST=emerge-nami coreboot chromeos-bootimage Change-Id: I5a204bc3342a3462f177c3ed6b8443e31816091c Signed-off-by: Shelley Chen <shchen@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/46508 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Furquan Shaikh <furquan@google.com>
-rw-r--r--src/drivers/intel/fsp2_0/memory_init.c2
-rw-r--r--src/security/vboot/mrc_cache_hash_tpm.c2
-rw-r--r--src/security/vboot/mrc_cache_hash_tpm.h (renamed from src/drivers/intel/fsp2_0/include/fsp/memory_init.h)6
3 files changed, 5 insertions, 5 deletions
diff --git a/src/drivers/intel/fsp2_0/memory_init.c b/src/drivers/intel/fsp2_0/memory_init.c
index 1ef9324d40..14aec98d43 100644
--- a/src/drivers/intel/fsp2_0/memory_init.c
+++ b/src/drivers/intel/fsp2_0/memory_init.c
@@ -20,8 +20,8 @@
#include <timestamp.h>
#include <security/vboot/vboot_common.h>
#include <security/tpm/tspi.h>
+#include <security/vboot/mrc_cache_hash_tpm.h>
#include <vb2_api.h>
-#include <fsp/memory_init.h>
#include <types.h>
static uint8_t temp_ram[CONFIG_FSP_TEMP_RAM_SIZE] __aligned(sizeof(uint64_t));
diff --git a/src/security/vboot/mrc_cache_hash_tpm.c b/src/security/vboot/mrc_cache_hash_tpm.c
index bc500a29f5..24e7aafaa7 100644
--- a/src/security/vboot/mrc_cache_hash_tpm.c
+++ b/src/security/vboot/mrc_cache_hash_tpm.c
@@ -5,7 +5,7 @@
#include <security/vboot/vboot_common.h>
#include <vb2_api.h>
#include <security/tpm/tss.h>
-#include <fsp/memory_init.h>
+#include <security/vboot/mrc_cache_hash_tpm.h>
#include <console/console.h>
#include <string.h>
diff --git a/src/drivers/intel/fsp2_0/include/fsp/memory_init.h b/src/security/vboot/mrc_cache_hash_tpm.h
index e100efbeaa..a1ecd8bfca 100644
--- a/src/drivers/intel/fsp2_0/include/fsp/memory_init.h
+++ b/src/security/vboot/mrc_cache_hash_tpm.h
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef _FSP2_0_MEMORY_INIT_H_
-#define _FSP2_0_MEMORY_INIT_H_
+#ifndef _MRC_CACHE_HASH_TPM_H_
+#define _MRC_CACHE_HASH_TPM_H_
#include <types.h>
@@ -16,4 +16,4 @@ void mrc_cache_update_hash(const uint8_t *data, size_t size);
*/
int mrc_cache_verify_hash(const uint8_t *data, size_t size);
-#endif /* _FSP2_0_MEMORY_INIT_H_ */
+#endif /* _MRC_CACHE_HASH_TPM_H_ */