summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMary Ruthven <mruthven@chromium.org>2021-01-06 12:22:08 -0800
committerCommit Bot <commit-bot@chromium.org>2021-01-10 06:34:53 +0000
commit7d462d74c6989e8f7fe11efb1c26377e93bc99d0 (patch)
tree8c32faa9354472d438065c2c8a3b58349b17098a
parent7e511dbe3239d6332c3b0f858e0d21b7e62fc6bf (diff)
downloadchrome-ec-7d462d74c6989e8f7fe11efb1c26377e93bc99d0.tar.gz
coil: CONFIG_TPM_SPS->CONFIG_TPM_SPP
BUG=b:175244613 TEST=make buildall -j Change-Id: If1d3a3e11736bf6da85938a607038a93254e9cc0 Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2615126
-rw-r--r--board/cr50/board.h2
-rw-r--r--chip/g/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 e91c228594..8173125947 100644
--- a/board/cr50/board.h
+++ b/board/cr50/board.h
@@ -142,7 +142,7 @@
/* Enable SPI peripheral (SPP) module */
#define CONFIG_SPP
-#define CONFIG_TPM_SPS
+#define CONFIG_TPM_SPP
#define CONFIG_RBOX
#define CONFIG_RBOX_WAKEUP
diff --git a/chip/g/build.mk b/chip/g/build.mk
index 332dc7760b..75e3b87684 100644
--- a/chip/g/build.mk
+++ b/chip/g/build.mk
@@ -71,7 +71,7 @@ chip-$(CONFIG_ENABLE_H1_ALERTS)+= alerts.o
chip-$(CONFIG_USB_FW_UPDATE)+= usb_upgrade.o
chip-$(CONFIG_NON_HC_FW_UPDATE)+= upgrade_fw.o post_reset.o upgrade.o
chip-$(CONFIG_SPP)+= spp.o
-chip-$(CONFIG_TPM_SPS)+=spp_tpm.o
+chip-$(CONFIG_TPM_SPP)+=spp_tpm.o
chip-$(CONFIG_WATCHDOG)+=watchdog.o
chip-$(CONFIG_USB)+=usb.o usb_endpoints.o
diff --git a/include/config.h b/include/config.h
index 3f184be58f..27b2769158 100644
--- a/include/config.h
+++ b/include/config.h
@@ -3437,8 +3437,8 @@
/*****************************************************************************/
/* TPM-like configuration */
-/* Speak the TPM SPI Hardware Protocol on the SPI slave interface */
-#undef CONFIG_TPM_SPS
+/* Speak the TPM SPI Hardware Protocol on the SPI peripheral interface */
+#undef CONFIG_TPM_SPP
/* Speak to the TPM 2.0 hardware protocol on the I2C periph interface */
#undef CONFIG_TPM_I2CP