diff --git a/src/vendorcode/google/chromeos/vboot2/Kconfig b/src/vendorcode/google/chromeos/vboot2/Kconfig
index cfa22b6da6..01011f81da 100644
--- a/src/vendorcode/google/chromeos/vboot2/Kconfig
+++ b/src/vendorcode/google/chromeos/vboot2/Kconfig
@@ -62,3 +62,13 @@ config VBOOT_DISABLE_DEV_ON_RECOVERY
 	  When this option is enabled, the Chrome OS device leaves the
 	  developer mode as soon as recovery request is detected. This is
 	  handy on embedded devices with limited input capabilities.
+
+config VERSTAGE_IN_BOOTBLOCK
+	bool
+	default n
+	depends on VBOOT2_VERIFY_FIRMWARE
+
+config SEPARATE_VERSTAGE
+	bool
+	default !VERSTAGE_IN_BOOTBLOCK
+	depends on VBOOT2_VERIFY_FIRMWARE
diff --git a/src/vendorcode/google/chromeos/vboot2/Makefile.inc b/src/vendorcode/google/chromeos/vboot2/Makefile.inc
index 14bf31ec03..b2d2dc1035 100644
--- a/src/vendorcode/google/chromeos/vboot2/Makefile.inc
+++ b/src/vendorcode/google/chromeos/vboot2/Makefile.inc
@@ -57,7 +57,11 @@ $(VB2_LIB): $(obj)/config.h
 
 verstage-srcs += $(VB2_LIB)
 
+ifeq ($(CONFIG_SEPARATE_VERSTAGE),y)
 cbfs-files-y += $(call strip_quotes,$(CONFIG_CBFS_PREFIX))/verstage
 fallback/verstage-file = $(objcbfs)/verstage.elf
 fallback/verstage-type = stage
 fallback/verstage-compression = none
+else
+bootblock-srcs += $(objgenerated)/libverstage.a
+endif