summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/google/skyrim/Kconfig5
-rw-r--r--src/security/tpm/Kconfig1
2 files changed, 1 insertions, 5 deletions
diff --git a/src/mainboard/google/skyrim/Kconfig b/src/mainboard/google/skyrim/Kconfig
index 4e9ae982b7..59f6c67872 100644
--- a/src/mainboard/google/skyrim/Kconfig
+++ b/src/mainboard/google/skyrim/Kconfig
@@ -247,9 +247,4 @@ config SPI_FLASH_STMICRO
config SPI_FLASH_WINBOND
default y
-# Enable hibernate on TPM setup error as needed
-config TPM_SETUP_HIBERNATE_ON_ERR
- bool
- default y
-
endif # BOARD_GOOGLE_BASEBOARD_SKYRIM
diff --git a/src/security/tpm/Kconfig b/src/security/tpm/Kconfig
index c06150dacd..e129f51d26 100644
--- a/src/security/tpm/Kconfig
+++ b/src/security/tpm/Kconfig
@@ -176,6 +176,7 @@ endmenu # Trusted Platform Module (tpm)
config TPM_SETUP_HIBERNATE_ON_ERR
bool
depends on EC_GOOGLE_CHROMEEC
+ default y
help
Select this to force a device to hibernate on the next AP shutdown when a TPM
setup error occurs. This will cause a cold boot of the system and offer an