diff --git a/Documentation/mainboard/lenovo/vboot.md b/Documentation/mainboard/lenovo/vboot.md
index 0a451ab7c4..eb71583355 100644
--- a/Documentation/mainboard/lenovo/vboot.md
+++ b/Documentation/mainboard/lenovo/vboot.md
@@ -9,7 +9,7 @@ updates using an A/B partitioning scheme once enabled.
 ## Enabling vboot
 You can enable [vboot] in Kconfig's *Security* section. Besides a verified
 boot you can also enable a measured boot by setting
-`CONFIG_VBOOT_MEASURED_BOOT`. Both options need a working TPM, which is
+`CONFIG_TPM_MEASURED_BOOT`. Both options need a working TPM, which is
 present on all recent Lenovo devices.
 
 ## Updating and recovery
diff --git a/Documentation/security/vboot/measured_boot.md b/Documentation/security/vboot/measured_boot.md
index c8014c2dfd..9866285c6e 100644
--- a/Documentation/security/vboot/measured_boot.md
+++ b/Documentation/security/vboot/measured_boot.md
@@ -68,7 +68,7 @@ specific IBB measurements without hard-coding them.
 
 #### Runtime Data
 * CBFS data which changes by external input dynamically. Never stays the same.
-* It is identified by VBOOT_MEASURED_BOOT_RUNTIME_DATA kconfig option and
+* It is identified by TPM_MEASURED_BOOT_RUNTIME_DATA kconfig option and
   measured into a different PCR (PCR_RUNTIME_DATA kconfig option, 3 by default)
   in order to avoid PCR pre-calculation issues.
 
diff --git a/configs/config.google_octopus_spi_flash_console b/configs/config.google_octopus_spi_flash_console
index df8889b019..570528b1c0 100644
--- a/configs/config.google_octopus_spi_flash_console
+++ b/configs/config.google_octopus_spi_flash_console
@@ -1,4 +1,4 @@
 CONFIG_VENDOR_GOOGLE=y
 CONFIG_BOARD_GOOGLE_OCTOPUS=y
 CONFIG_CONSOLE_SPI_FLASH=y
-# CONFIG_VBOOT_MEASURED_BOOT is not set
+# CONFIG_TPM_MEASURED_BOOT is not set
diff --git a/src/soc/amd/stoneyridge/Makefile.inc b/src/soc/amd/stoneyridge/Makefile.inc
index 47bdf0f587..93f3a920f6 100644
--- a/src/soc/amd/stoneyridge/Makefile.inc
+++ b/src/soc/amd/stoneyridge/Makefile.inc
@@ -26,7 +26,7 @@ verstage-y += gpio.c
 verstage-y += i2c.c
 
 postcar-y += memmap.c
-postcar-$(CONFIG_VBOOT_MEASURED_BOOT) += i2c.c
+postcar-$(CONFIG_TPM_MEASURED_BOOT) += i2c.c
 
 ramstage-y += aoac.c
 ramstage-y += BiosCallOuts.c
diff --git a/util/abuild/abuild b/util/abuild/abuild
index 4bdf7ee6bc..1adf0462ff 100755
--- a/util/abuild/abuild
+++ b/util/abuild/abuild
@@ -883,7 +883,7 @@ while true ; do
 			chromeos=true
 			testclass=chromeos
 			customizing="${customizing}, chromeos"
-			configoptions="${configoptions}CONFIG_CHROMEOS=y\nCONFIG_VBOOT_MEASURED_BOOT=y\n"
+			configoptions="${configoptions}CONFIG_CHROMEOS=y\n"
 			;;
 		-X|--xmlfile)	shift
 			XMLFILE=$1