summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorMary Ruthven <mruthven@chromium.org>2022-12-05 17:36:42 -0800
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2023-03-16 12:25:44 +0000
commita72eda8f7e50da8a4cb5ab228f4141130546177f (patch)
tree930a9def56bf344f9f7db6a57c73c31b0acd9ae2 /common
parentdff1ae07a1a35b0862b36d1e23e36b38682c5bdd (diff)
downloadchrome-ec-a72eda8f7e50da8a4cb5ab228f4141130546177f.tar.gz
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>
Diffstat (limited to 'common')
-rw-r--r--common/build.mk2
-rw-r--r--common/pinweaver_cr50.c (renamed from common/pinweaver.c)4
2 files changed, 3 insertions, 3 deletions
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>