summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMary Ruthven <mruthven@chromium.org>2021-01-05 18:13:16 -0800
committerCommit Bot <commit-bot@chromium.org>2021-01-07 19:21:53 +0000
commitd619e3e95b67728f1c6faff6eb39ac9101ca2328 (patch)
tree78161053eaad5a98d11096a7544362ab19ad6cbb
parent2be9f07b1e2e6d23d6592ac34fad3e3fd5d3b60f (diff)
downloadchrome-ec-d619e3e95b67728f1c6faff6eb39ac9101ca2328.tar.gz
coil: CONFIG_TPM_I2CS->CONFIG_TPM_I2CP
BUG=b:175244613 TEST=make buildall -j Change-Id: I9d5bfc3bb65bb05d1deb1a16838222b93704bf8a Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2611759 Reviewed-by: Namyoon Woo <namyoon@chromium.org>
-rw-r--r--board/cr50/board.h2
-rw-r--r--common/build.mk2
-rw-r--r--include/config.h4
3 files changed, 4 insertions, 4 deletions
diff --git a/board/cr50/board.h b/board/cr50/board.h
index 6eb075a022..69e2a5d1a7 100644
--- a/board/cr50/board.h
+++ b/board/cr50/board.h
@@ -509,7 +509,7 @@ enum nvmem_users {
#define CONFIG_I2C
#define CONFIG_I2C_CONTROLLER
#define CONFIG_I2C_PERIPH
-#define CONFIG_TPM_I2CS
+#define CONFIG_TPM_I2CP
#define CONFIG_BOARD_ID_SUPPORT
#define CONFIG_SN_BITS_SUPPORT
diff --git a/common/build.mk b/common/build.mk
index e4e0fb151d..79938a7fc8 100644
--- a/common/build.mk
+++ b/common/build.mk
@@ -119,7 +119,7 @@ common-$(CONFIG_TEMP_SENSOR)+=temp_sensor.o
common-$(CONFIG_THROTTLE_AP)+=thermal.o throttle_ap.o
common-$(CONFIG_THROTTLE_AP_ON_BAT_DISCHG_CURRENT)+=throttle_ap.o
common-$(CONFIG_THROTTLE_AP_ON_BAT_VOLTAGE)+=throttle_ap.o
-common-$(CONFIG_TPM_I2CS)+=i2cs_tpm.o
+common-$(CONFIG_TPM_I2CP)+=i2cs_tpm.o
common-$(CONFIG_U2F)+=u2f.o
common-$(CONFIG_USB_CONSOLE_STREAM)+=usb_console_stream.o
common-$(CONFIG_USB_I2C)+=usb_i2c.o
diff --git a/include/config.h b/include/config.h
index 52e1771081..acb2cc340f 100644
--- a/include/config.h
+++ b/include/config.h
@@ -3439,8 +3439,8 @@
/* Speak the TPM SPI Hardware Protocol on the SPI slave interface */
#undef CONFIG_TPM_SPS
-/* Speak to the TPM 2.0 hardware protocol on the I2C slave interface */
-#undef CONFIG_TPM_I2CS
+/* Speak to the TPM 2.0 hardware protocol on the I2C periph interface */
+#undef CONFIG_TPM_I2CP
/*****************************************************************************/
/* USART stream config */