diff --git a/src/drivers/intel/fsp2_0/silicon_init.c b/src/drivers/intel/fsp2_0/silicon_init.c
index ecc6e96ace..88ec88a19d 100644
--- a/src/drivers/intel/fsp2_0/silicon_init.c
+++ b/src/drivers/intel/fsp2_0/silicon_init.c
@@ -70,15 +70,12 @@ static void do_silicon_init(struct fsp_header *hdr)
 	/* Handle any errors returned by FspSiliconInit */
 	fsp_handle_reset(status);
 	if (status != FSP_SUCCESS) {
-		if (vbt_get()) {
-			/* Attempted to initialize graphics. Assume failure
-			 * is related to a video failure.
-			 */
+		/* Assume video failure if attempted to initialize graphics */
+		if (CONFIG(RUN_FSP_GOP) && vbt_get())
 			postcode = POST_VIDEO_FAILURE;
-		} else {
-			/* Other silicon initialization failed */
-			postcode = POST_HW_INIT_FAILURE;
-		}
+		else
+			postcode = POST_HW_INIT_FAILURE; /* else generic */
+
 		printk(BIOS_SPEW, "FspSiliconInit returned 0x%08x\n", status);
 		die_with_post_code(postcode,
 			"FspSiliconInit returned an error!\n");