diff --git a/src/drivers/intel/fsp1_1/fsp_util.c b/src/drivers/intel/fsp1_1/fsp_util.c
index bce43371..1d67e78 100644
--- a/src/drivers/intel/fsp1_1/fsp_util.c
+++ b/src/drivers/intel/fsp1_1/fsp_util.c
@@ -36,6 +36,13 @@
 		u8 *u8;
 		u32 u32;
 	} fsp_ptr;
+	static const union {
+		char str_id[8];
+		u32 int_id[2];
+	} fsp_id = {
+		.str_id = CONFIG_FSP_IMAGE_ID_STRING
+	};
+
 	u32 *image_id;
 
 	for (;;) {
@@ -87,8 +94,8 @@
 
 		/* Verify the FSP ID */
 		image_id = (u32 *)&fsp_ptr.fih->ImageId[0];
-		if ((image_id[0] != CONFIG_FSP_IMAGE_ID_DWORD0)
-			|| (image_id[1] != CONFIG_FSP_IMAGE_ID_DWORD1))
+		if ((image_id[0] != fsp_id.int_id[0])
+			|| (image_id[1] != fsp_id.int_id[1]))
 			fsp_ptr.u8 = (u8 *)ERROR_FSP_SIG_MISMATCH;
 		break;
 	}