diff --git a/src/cpu/intel/haswell/romstage.c b/src/cpu/intel/haswell/romstage.c
index 40a396d501..6b5780bdbc 100644
--- a/src/cpu/intel/haswell/romstage.c
+++ b/src/cpu/intel/haswell/romstage.c
@@ -308,9 +308,7 @@ void romstage_after_car(void)
 
 	prepare_for_resume(handoff);
 
-#if CONFIG_VBOOT_VERIFY_FIRMWARE
 	vboot_verify_firmware(handoff);
-#endif
 
 	/* Load the ramstage. */
 	copy_and_run();
diff --git a/src/vendorcode/google/chromeos/chromeos.h b/src/vendorcode/google/chromeos/chromeos.h
index f51215e12e..5493801a09 100644
--- a/src/vendorcode/google/chromeos/chromeos.h
+++ b/src/vendorcode/google/chromeos/chromeos.h
@@ -46,12 +46,14 @@ int recovery_mode_enabled(void);
 /* functions implemented in vboot.c */
 void init_chromeos(int bootmode);
 
-#if CONFIG_VBOOT_VERIFY_FIRMWARE
 struct romstage_handoff;
+#if CONFIG_VBOOT_VERIFY_FIRMWARE
 void vboot_verify_firmware(struct romstage_handoff *handoff);
 void *vboot_get_payload(size_t *len);
 /* Returns 0 on success < 0 on error. */
 int vboot_get_handoff_info(void **addr, uint32_t *size);
+#else
+static inline void vboot_verify_firmware(struct romstage_handoff *h) {}
 #endif
 
 #endif