diff --git a/src/ec/google/chromeec/Makefile.inc b/src/ec/google/chromeec/Makefile.inc
index f1b6da03fd..0df6e8b1c5 100644
--- a/src/ec/google/chromeec/Makefile.inc
+++ b/src/ec/google/chromeec/Makefile.inc
@@ -10,4 +10,10 @@ romstage-y += ec.c crosec_proto.c
 romstage-$(CONFIG_EC_GOOGLE_CHROMEEC_I2C) += ec_i2c.c
 romstage-$(CONFIG_EC_GOOGLE_CHROMEEC_LPC) += ec_lpc.c
 romstage-$(CONFIG_EC_GOOGLE_CHROMEEC_SPI) += ec_spi.c
+ifeq ($(CONFIG_VBOOT2_VERIFY_FIRMWARE),y)
+verstage-y += ec.c crosec_proto.c
+verstage-$(CONFIG_EC_GOOGLE_CHROMEEC_I2C) += ec_i2c.c
+verstage-$(CONFIG_EC_GOOGLE_CHROMEEC_LPC) += ec_lpc.c
+verstage-$(CONFIG_EC_GOOGLE_CHROMEEC_SPI) += ec_spi.c
+endif
 
diff --git a/src/mainboard/google/nyan_blaze/Makefile.inc b/src/mainboard/google/nyan_blaze/Makefile.inc
index ced15d34b5..88ca298aa5 100644
--- a/src/mainboard/google/nyan_blaze/Makefile.inc
+++ b/src/mainboard/google/nyan_blaze/Makefile.inc
@@ -32,6 +32,7 @@ bootblock-y += bootblock.c
 bootblock-y += pmic.c
 bootblock-y += reset.c
 
+verstage-y += chromeos.c
 verstage-y += reset.c
 
 romstage-y += reset.c
diff --git a/src/vendorcode/google/chromeos/vboot_main.c b/src/vendorcode/google/chromeos/vboot_main.c
index 907afd73b3..8251cfd9b4 100644
--- a/src/vendorcode/google/chromeos/vboot_main.c
+++ b/src/vendorcode/google/chromeos/vboot_main.c
@@ -264,12 +264,12 @@ void __attribute__((noinline)) select_firmware(void)
 	 * invalid secdata and tell us what to do (=reboot). */
 	//antirollback_read_space_firmware(&ctx);
 
-	//if (get_developer_mode_switch())
-	//	ctx.flags |= VB2_CONTEXT_FORCE_DEVELOPER_MODE;
-	//if (get_recovery_mode_switch()) {
-	//	clear_recovery_mode_switch();
-	//	ctx.flags |= VB2_CONTEXT_FORCE_RECOVERY_MODE;
-	//}
+	if (get_developer_mode_switch())
+		ctx.flags |= VB2_CONTEXT_FORCE_DEVELOPER_MODE;
+	if (get_recovery_mode_switch()) {
+		clear_recovery_mode_switch();
+		ctx.flags |= VB2_CONTEXT_FORCE_RECOVERY_MODE;
+	}
 
 	/* Do early init */
 	VBDEBUG("Phase 1\n");