diff --git a/src/mainboard/intel/galileo/Kconfig b/src/mainboard/intel/galileo/Kconfig
index 37f88dd8f0..84f09c4f82 100644
--- a/src/mainboard/intel/galileo/Kconfig
+++ b/src/mainboard/intel/galileo/Kconfig
@@ -110,7 +110,6 @@ config VBOOT_WITH_CRYPTO_SHIELD
 	select VBOOT_SEPARATE_VERSTAGE
 	select VBOOT
 	select VBOOT_STARTS_IN_BOOTBLOCK
-	select VBOOT_SOFT_REBOOT_WORKAROUND
 	select VBOOT_VBNV_CMOS
 	help
 	  Perform a verified boot using the TPM on the Crypto Shield board.
diff --git a/src/security/vboot/Kconfig b/src/security/vboot/Kconfig
index d6d74cac73..e3b8aa68e2 100644
--- a/src/security/vboot/Kconfig
+++ b/src/security/vboot/Kconfig
@@ -174,10 +174,6 @@ config VBOOT_HAS_REC_HASH_SPACE
 	  Set this option to indicate to vboot that recovery data hash space
 	  is present in TPM.
 
-config VBOOT_SOFT_REBOOT_WORKAROUND
-	bool
-	default n
-
 config VBOOT_LID_SWITCH
 	bool
 	default n