Shelley Chen has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/46508 )
Change subject: security/vboot: Rename mem_init.h to mrc_cache_hash_tpm.h ......................................................................
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 --- M src/drivers/intel/fsp2_0/memory_init.c M src/security/vboot/mrc_cache_hash_tpm.c R src/security/vboot/mrc_cache_hash_tpm.h 3 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/46508/1
diff --git a/src/drivers/intel/fsp2_0/memory_init.c b/src/drivers/intel/fsp2_0/memory_init.c index 1ef9324..14aec98 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 bc500a2..24e7aaf 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 similarity index 77% rename from src/drivers/intel/fsp2_0/include/fsp/memory_init.h rename to src/security/vboot/mrc_cache_hash_tpm.h index e100efb..a1ecd8b 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 @@ */ int mrc_cache_verify_hash(const uint8_t *data, size_t size);
-#endif /* _FSP2_0_MEMORY_INIT_H_ */ +#endif /* _MRC_CACHE_HASH_TPM_H_ */
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46508 )
Change subject: security/vboot: Rename mem_init.h to mrc_cache_hash_tpm.h ......................................................................
Patch Set 1: Code-Review+2
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/46508 )
Change subject: security/vboot: Rename mem_init.h to mrc_cache_hash_tpm.h ......................................................................
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 --- M src/drivers/intel/fsp2_0/memory_init.c M src/security/vboot/mrc_cache_hash_tpm.c R src/security/vboot/mrc_cache_hash_tpm.h 3 files changed, 5 insertions(+), 5 deletions(-)
Approvals: build bot (Jenkins): Verified Furquan Shaikh: Looks good to me, approved
diff --git a/src/drivers/intel/fsp2_0/memory_init.c b/src/drivers/intel/fsp2_0/memory_init.c index 1ef9324..14aec98 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 bc500a2..24e7aaf 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 similarity index 77% rename from src/drivers/intel/fsp2_0/include/fsp/memory_init.h rename to src/security/vboot/mrc_cache_hash_tpm.h index e100efb..a1ecd8b 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 @@ */ int mrc_cache_verify_hash(const uint8_t *data, size_t size);
-#endif /* _FSP2_0_MEMORY_INIT_H_ */ +#endif /* _MRC_CACHE_HASH_TPM_H_ */
-
Furquan Shaikh (Code Review) -
Patrick Georgi (Code Review)
-
Shelley Chen (Code Review)