cr50: Rename pinweaver code

Rename the headers so they will not collide with platform/pinweaver
headers with the same names.

BUG=b:262040869
TEST=make -j BOARD=cr50

Cq-Depend: chromium:4337377
Change-Id: Iee9f44c4fcb6ab0a01faec5886f07b84c271d1fc
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4311233
Reviewed-by: Andrey Pronin <apronin@chromium.org>
Tested-by: Howard Yang <hcyang@google.com>
Commit-Queue: Howard Yang <hcyang@google.com>

8 files changed, 10 insertions, 10 deletions

diff --git a/board/cr50/tpm2/platform.c b/board/cr50/tpm2/platform.c
index 6ee80edbb2..5bbc927f08 100644
--- a/board/cr50/tpm2/platform.c
+++ b/board/cr50/tpm2/platform.c
@@ -8,7 +8,7 @@
 
 #include "ccd_config.h"
 #include "console.h"
-#include "pinweaver.h"
+#include "pinweaver_cr50.h"
 #include "tpm_nvmem.h"
 #include "tpm_nvmem_ops.h"
 #include "dcrypto.h"
diff --git a/common/build.mk b/common/build.mk
index ec5ce99916..da97209f3a 100644
--- a/common/build.mk
+++ b/common/build.mk
@@ -90,7 +90,7 @@ common-$(CONFIG_MAG_CALIBRATE)+= mag_cal.o math_util.o vec3.o mat33.o mat44.o
 common-$(CONFIG_MKBP_EVENT)+=mkbp_event.o
 common-$(CONFIG_PECI_COMMON)+=peci.o
 common-$(CONFIG_PHYSICAL_PRESENCE)+=physical_presence.o
-common-$(CONFIG_PINWEAVER)+=pinweaver.o
+common-$(CONFIG_PINWEAVER)+=pinweaver_cr50.o
 common-$(CONFIG_POWER_BUTTON)+=power_button.o
 common-$(CONFIG_POWER_BUTTON_X86)+=power_button_x86.o
 common-$(CONFIG_PSTORE)+=pstore_commands.o
diff --git a/common/pinweaver.c b/common/pinweaver_cr50.c
index 31879da987..74adbe8a6d 100644
--- a/common/pinweaver.c
+++ b/common/pinweaver_cr50.c
@@ -10,9 +10,9 @@
 #include <extension.h>
 #include <hooks.h>
 #include <nvmem_vars.h>
-#include <pinweaver.h>
+#include <pinweaver_cr50.h>
 #include <pinweaver_tpm_imports.h>
-#include <pinweaver_types.h>
+#include <pinweaver_cr50_types.h>
 #include <timer.h>
 #include <tpm_vendor_cmds.h>
 #include <tpm_registers.h>
diff --git a/fuzz/pinweaver_fuzz.cc b/fuzz/pinweaver_fuzz.cc
index f7a1cd0845..f0095243c0 100644
--- a/fuzz/pinweaver_fuzz.cc
+++ b/fuzz/pinweaver_fuzz.cc
@@ -23,7 +23,7 @@
 #include "fuzz/span.h"
 #include "include/nvmem.h"
 #include "include/nvmem_vars.h"
-#include "include/pinweaver.h"
+#include "include/pinweaver_cr50.h"
 
 using protobuf_mutator::libfuzzer::LoadProtoInput;
 
diff --git a/fuzz/pinweaver_model.h b/fuzz/pinweaver_model.h
index a16e54690f..927d9bf71d 100644
--- a/fuzz/pinweaver_model.h
+++ b/fuzz/pinweaver_model.h
@@ -15,8 +15,8 @@
 #include "fuzz/pinweaver_fuzz.pb.h"
 #include "fuzz/mem_hash_tree.h"
 #include "fuzz/span.h"
-#include "include/pinweaver.h"
-#include "include/pinweaver_types.h"
+#include "include/pinweaver_cr50.h"
+#include "include/pinweaver_cr50_types.h"
 
 // Provides enough state tracking to send valid PinWeaver requests. This is
 // necessary because of the authentication dependent fields used by the Merkle
diff --git a/include/pinweaver.h b/include/pinweaver_cr50.h
index 08fdce7c4b..4d4f553097 100644
--- a/include/pinweaver.h
+++ b/include/pinweaver_cr50.h
@@ -11,7 +11,7 @@
  * of src/platform/ec.
  */
 #include <common.h>
-#include <pinweaver_types.h>
+#include <pinweaver_cr50_types.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/pinweaver_types.h b/include/pinweaver_cr50_types.h
index 62a3aa85f6..62a3aa85f6 100644
--- a/include/pinweaver_types.h
+++ b/include/pinweaver_cr50_types.h
diff --git a/test/pinweaver.c b/test/pinweaver.c
index 332edc5f2e..5ca60c354f 100644
--- a/test/pinweaver.c
+++ b/test/pinweaver.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <pinweaver.h>
+#include <pinweaver_cr50.h>
 
 #include <dcrypto.h>
 #include <nvmem_vars.h>
@@ -11,7 +11,7 @@
 #include <string.h>
 #include <timer.h>
 #include <util.h>
-#include <pinweaver_types.h>
+#include <pinweaver_cr50_types.h>
 
 #include "test_util.h"