diff --git a/src/soc/intel/skylake/bootblock/report_platform.c b/src/soc/intel/skylake/bootblock/report_platform.c
index 4af51d60..3cfac5e 100644
--- a/src/soc/intel/skylake/bootblock/report_platform.c
+++ b/src/soc/intel/skylake/bootblock/report_platform.c
@@ -34,62 +34,62 @@
 	u16 mchid;
 	const char *name;
 } mch_table[] = {
-	{ PCI_DEVICE_ID_INTEL_SKL_ID_U, "Skylake-U" },
-	{ PCI_DEVICE_ID_INTEL_SKL_ID_Y, "Skylake-Y" },
-	{ PCI_DEVICE_ID_INTEL_SKL_ID_ULX, "Skylake-ULX" },
-	{ PCI_DEVICE_ID_INTEL_SKL_ID_H_4, "Skylake-H (4 Core)" },
-	{ PCI_DEVICE_ID_INTEL_SKL_ID_H_EM, "Skylake-H Embedded" },
-	{ PCI_DEVICE_ID_INTEL_SKL_ID_H_2, "Skylake-H (2 Core)" },
-	{ PCI_DEVICE_ID_INTEL_SKL_ID_S_2, "Skylake-S (2 Core)" },
-	{ PCI_DEVICE_ID_INTEL_SKL_ID_S_4, "Skylake-S (4 Core) / Skylake-DT" },
-	{ PCI_DEVICE_ID_INTEL_KBL_ID_U, "Kabylake-U" },
-	{ PCI_DEVICE_ID_INTEL_KBL_U_R, "Kabylake-R ULT"},
-	{ PCI_DEVICE_ID_INTEL_KBL_ID_Y, "Kabylake-Y" },
-	{ PCI_DEVICE_ID_INTEL_KBL_ID_H, "Kabylake-H" },
-	{ PCI_DEVICE_ID_INTEL_KBL_ID_S, "Kabylake-S" },
-	{ PCI_DEVICE_ID_INTEL_KBL_ID_DT, "Kabylake DT" },
-	{ PCI_DEVICE_ID_INTEL_KBL_ID_DT_2, "Kabylake DT 2" },
+	{ PCI_DID_INTEL_SKL_ID_U, "Skylake-U" },
+	{ PCI_DID_INTEL_SKL_ID_Y, "Skylake-Y" },
+	{ PCI_DID_INTEL_SKL_ID_ULX, "Skylake-ULX" },
+	{ PCI_DID_INTEL_SKL_ID_H_4, "Skylake-H (4 Core)" },
+	{ PCI_DID_INTEL_SKL_ID_H_EM, "Skylake-H Embedded" },
+	{ PCI_DID_INTEL_SKL_ID_H_2, "Skylake-H (2 Core)" },
+	{ PCI_DID_INTEL_SKL_ID_S_2, "Skylake-S (2 Core)" },
+	{ PCI_DID_INTEL_SKL_ID_S_4, "Skylake-S (4 Core) / Skylake-DT" },
+	{ PCI_DID_INTEL_KBL_ID_U, "Kabylake-U" },
+	{ PCI_DID_INTEL_KBL_U_R, "Kabylake-R ULT"},
+	{ PCI_DID_INTEL_KBL_ID_Y, "Kabylake-Y" },
+	{ PCI_DID_INTEL_KBL_ID_H, "Kabylake-H" },
+	{ PCI_DID_INTEL_KBL_ID_S, "Kabylake-S" },
+	{ PCI_DID_INTEL_KBL_ID_DT, "Kabylake DT" },
+	{ PCI_DID_INTEL_KBL_ID_DT_2, "Kabylake DT 2" },
 };
 
 static struct {
 	u16 lpcid;
 	const char *name;
 } pch_table[] = {
-	{ PCI_DEVICE_ID_INTEL_SPT_LP_SAMPLE, "Skylake LP Sample" },
-	{ PCI_DEVICE_ID_INTEL_SPT_LP_U_BASE, "Skylake-U Base" },
-	{ PCI_DEVICE_ID_INTEL_SPT_LP_U_PREMIUM, "Skylake-U Premium" },
-	{ PCI_DEVICE_ID_INTEL_SPT_LP_Y_PREMIUM, "Skylake-Y Premium" },
-	{ PCI_DEVICE_ID_INTEL_SPT_H_H110, "H110" },
-	{ PCI_DEVICE_ID_INTEL_SPT_H_H170, "H170" },
-	{ PCI_DEVICE_ID_INTEL_SPT_H_Z170, "Z170" },
-	{ PCI_DEVICE_ID_INTEL_SPT_H_Q170, "Q170" },
-	{ PCI_DEVICE_ID_INTEL_SPT_H_Q150, "Q150" },
-	{ PCI_DEVICE_ID_INTEL_SPT_H_B150, "B150" },
-	{ PCI_DEVICE_ID_INTEL_SPT_H_C236, "C236" },
-	{ PCI_DEVICE_ID_INTEL_SPT_H_C232, "C232" },
-	{ PCI_DEVICE_ID_INTEL_SPT_H_QM170, "QM170" },
-	{ PCI_DEVICE_ID_INTEL_SPT_H_HM170, "HM170" },
-	{ PCI_DEVICE_ID_INTEL_SPT_H_CM236, "CM236" },
-	{ PCI_DEVICE_ID_INTEL_SPT_H_HM175, "HM175" },
-	{ PCI_DEVICE_ID_INTEL_SPT_H_QM175, "QM175" },
-	{ PCI_DEVICE_ID_INTEL_SPT_H_CM238, "CM238" },
-	{ PCI_DEVICE_ID_INTEL_UPT_H_Q270, "Q270" },
-	{ PCI_DEVICE_ID_INTEL_UPT_H_H270, "H270" },
-	{ PCI_DEVICE_ID_INTEL_UPT_H_Z270, "Z270" },
-	{ PCI_DEVICE_ID_INTEL_UPT_H_B250, "B250" },
-	{ PCI_DEVICE_ID_INTEL_UPT_H_Q250, "Q250" },
-	{ PCI_DEVICE_ID_INTEL_UPT_H_Z370, "Z370" },
-	{ PCI_DEVICE_ID_INTEL_UPT_H_H310C, "H310C" },
-	{ PCI_DEVICE_ID_INTEL_UPT_H_B365, "B365" },
-	{ PCI_DEVICE_ID_INTEL_UPT_LP_U_BASE, "Kabylake-U Base" },
-	{ PCI_DEVICE_ID_INTEL_UPT_LP_U_PREMIUM, "Kabylake-U Premium" },
-	{ PCI_DEVICE_ID_INTEL_UPT_LP_Y_PREMIUM, "Kabylake-Y Premium" },
-	{ PCI_DEVICE_ID_INTEL_UPT_LP_SUPER_SKU, "Kabylake Super Sku" },
-	{ PCI_DEVICE_ID_INTEL_SPT_LP_Y_PREMIUM_HDCP22,
+	{ PCI_DID_INTEL_SPT_LP_SAMPLE, "Skylake LP Sample" },
+	{ PCI_DID_INTEL_SPT_LP_U_BASE, "Skylake-U Base" },
+	{ PCI_DID_INTEL_SPT_LP_U_PREMIUM, "Skylake-U Premium" },
+	{ PCI_DID_INTEL_SPT_LP_Y_PREMIUM, "Skylake-Y Premium" },
+	{ PCI_DID_INTEL_SPT_H_H110, "H110" },
+	{ PCI_DID_INTEL_SPT_H_H170, "H170" },
+	{ PCI_DID_INTEL_SPT_H_Z170, "Z170" },
+	{ PCI_DID_INTEL_SPT_H_Q170, "Q170" },
+	{ PCI_DID_INTEL_SPT_H_Q150, "Q150" },
+	{ PCI_DID_INTEL_SPT_H_B150, "B150" },
+	{ PCI_DID_INTEL_SPT_H_C236, "C236" },
+	{ PCI_DID_INTEL_SPT_H_C232, "C232" },
+	{ PCI_DID_INTEL_SPT_H_QM170, "QM170" },
+	{ PCI_DID_INTEL_SPT_H_HM170, "HM170" },
+	{ PCI_DID_INTEL_SPT_H_CM236, "CM236" },
+	{ PCI_DID_INTEL_SPT_H_HM175, "HM175" },
+	{ PCI_DID_INTEL_SPT_H_QM175, "QM175" },
+	{ PCI_DID_INTEL_SPT_H_CM238, "CM238" },
+	{ PCI_DID_INTEL_UPT_H_Q270, "Q270" },
+	{ PCI_DID_INTEL_UPT_H_H270, "H270" },
+	{ PCI_DID_INTEL_UPT_H_Z270, "Z270" },
+	{ PCI_DID_INTEL_UPT_H_B250, "B250" },
+	{ PCI_DID_INTEL_UPT_H_Q250, "Q250" },
+	{ PCI_DID_INTEL_UPT_H_Z370, "Z370" },
+	{ PCI_DID_INTEL_UPT_H_H310C, "H310C" },
+	{ PCI_DID_INTEL_UPT_H_B365, "B365" },
+	{ PCI_DID_INTEL_UPT_LP_U_BASE, "Kabylake-U Base" },
+	{ PCI_DID_INTEL_UPT_LP_U_PREMIUM, "Kabylake-U Premium" },
+	{ PCI_DID_INTEL_UPT_LP_Y_PREMIUM, "Kabylake-Y Premium" },
+	{ PCI_DID_INTEL_UPT_LP_SUPER_SKU, "Kabylake Super Sku" },
+	{ PCI_DID_INTEL_SPT_LP_Y_PREMIUM_HDCP22,
 			"Kabylake-Y iHDCP 2.2 Premium" },
-	{ PCI_DEVICE_ID_INTEL_SPT_LP_U_PREMIUM_HDCP22,
+	{ PCI_DID_INTEL_SPT_LP_U_PREMIUM_HDCP22,
 			"Kabylake-U iHDCP 2.2 Premium" },
-	{ PCI_DEVICE_ID_INTEL_SPT_LP_U_BASE_HDCP22,
+	{ PCI_DID_INTEL_SPT_LP_U_BASE_HDCP22,
 			"Kabylake-U iHDCP 2.2 Base" },
 };
 
@@ -97,37 +97,37 @@
 	u16 igdid;
 	const char *name;
 } igd_table[] = {
-	{ PCI_DEVICE_ID_INTEL_SKL_GT1F_DT2, "Skylake DT GT1F" },
-	{ PCI_DEVICE_ID_INTEL_SKL_GT1_SULTM, "Skylake ULT GT1" },
-	{ PCI_DEVICE_ID_INTEL_SKL_GT1F_SHALM, "Skylake HALO GT1F" },
-	{ PCI_DEVICE_ID_INTEL_SKL_GT2_DT2P1, "Skylake DT GT2" },
-	{ PCI_DEVICE_ID_INTEL_SKL_GT2_SULTM, "Skylake ULT GT2" },
-	{ PCI_DEVICE_ID_INTEL_SKL_GT2_SHALM, "Skylake HALO GT2" },
-	{ PCI_DEVICE_ID_INTEL_SKL_GT2_SWKSM, "Skylake Mobile Xeon GT2"},
-	{ PCI_DEVICE_ID_INTEL_SKL_GT2_SULXM, "Skylake ULX GT2" },
-	{ PCI_DEVICE_ID_INTEL_SKL_GT3_SULTM, "Skylake ULT GT3" },
-	{ PCI_DEVICE_ID_INTEL_SKL_GT3E_SULTM_1, "Skylake ULT (15W) GT3E" },
-	{ PCI_DEVICE_ID_INTEL_SKL_GT3E_SULTM_2, "Skylake ULT (28W) GT3E" },
-	{ PCI_DEVICE_ID_INTEL_SKL_GT3FE_SSRVM, "Skylake Media Server GT3FE" },
-	{ PCI_DEVICE_ID_INTEL_SKL_GT4_SHALM, "Skylake HALO GT4" },
-	{ PCI_DEVICE_ID_INTEL_SKL_GT4E_SWSTM, "Skylake Workstation GT4E" },
-	{ PCI_DEVICE_ID_INTEL_KBL_GT1F_DT2, "Kaby Lake DT GT1F" },
-	{ PCI_DEVICE_ID_INTEL_KBL_GT1_SULTM, "Kaby Lake ULT GT1" },
-	{ PCI_DEVICE_ID_INTEL_KBL_GT1_SHALM_1, "Kaby Lake HALO GT1" },
-	{ PCI_DEVICE_ID_INTEL_KBL_GT1_SHALM_2, "Kaby Lake HALO GT1" },
-	{ PCI_DEVICE_ID_INTEL_KBL_GT1_SSRVM, "Kaby Lake SRV GT1" },
-	{ PCI_DEVICE_ID_INTEL_KBL_GT2_SSRVM, "Kaby Lake Media Server GT2" },
-	{ PCI_DEVICE_ID_INTEL_KBL_GT2_SWSTM, "Kaby Lake Workstation GT2" },
-	{ PCI_DEVICE_ID_INTEL_KBL_GT2_SULXM, "Kaby Lake ULX GT2" },
-	{ PCI_DEVICE_ID_INTEL_KBL_GT2_SULTM, "Kaby Lake ULT GT2" },
-	{ PCI_DEVICE_ID_INTEL_KBL_GT2_SULTMR, "Kaby Lake-R ULT GT2" },
-	{ PCI_DEVICE_ID_INTEL_KBL_GT2_SHALM, "Kaby Lake HALO GT2" },
-	{ PCI_DEVICE_ID_INTEL_KBL_GT2_DT2P2, "Kaby Lake DT GT2" },
-	{ PCI_DEVICE_ID_INTEL_KBL_GT2F_SULTM, "Kaby Lake ULT GT2F" },
-	{ PCI_DEVICE_ID_INTEL_KBL_GT3E_SULTM_1, "Kaby Lake ULT (15W) GT3E" },
-	{ PCI_DEVICE_ID_INTEL_KBL_GT3E_SULTM_2, "Kaby Lake ULT (28W) GT3E" },
-	{ PCI_DEVICE_ID_INTEL_KBL_GT4_SHALM, "Kaby Lake HALO GT4" },
-	{ PCI_DEVICE_ID_INTEL_AML_GT2_ULX, "Amberlake ULX GT2" },
+	{ PCI_DID_INTEL_SKL_GT1F_DT2, "Skylake DT GT1F" },
+	{ PCI_DID_INTEL_SKL_GT1_SULTM, "Skylake ULT GT1" },
+	{ PCI_DID_INTEL_SKL_GT1F_SHALM, "Skylake HALO GT1F" },
+	{ PCI_DID_INTEL_SKL_GT2_DT2P1, "Skylake DT GT2" },
+	{ PCI_DID_INTEL_SKL_GT2_SULTM, "Skylake ULT GT2" },
+	{ PCI_DID_INTEL_SKL_GT2_SHALM, "Skylake HALO GT2" },
+	{ PCI_DID_INTEL_SKL_GT2_SWKSM, "Skylake Mobile Xeon GT2"},
+	{ PCI_DID_INTEL_SKL_GT2_SULXM, "Skylake ULX GT2" },
+	{ PCI_DID_INTEL_SKL_GT3_SULTM, "Skylake ULT GT3" },
+	{ PCI_DID_INTEL_SKL_GT3E_SULTM_1, "Skylake ULT (15W) GT3E" },
+	{ PCI_DID_INTEL_SKL_GT3E_SULTM_2, "Skylake ULT (28W) GT3E" },
+	{ PCI_DID_INTEL_SKL_GT3FE_SSRVM, "Skylake Media Server GT3FE" },
+	{ PCI_DID_INTEL_SKL_GT4_SHALM, "Skylake HALO GT4" },
+	{ PCI_DID_INTEL_SKL_GT4E_SWSTM, "Skylake Workstation GT4E" },
+	{ PCI_DID_INTEL_KBL_GT1F_DT2, "Kaby Lake DT GT1F" },
+	{ PCI_DID_INTEL_KBL_GT1_SULTM, "Kaby Lake ULT GT1" },
+	{ PCI_DID_INTEL_KBL_GT1_SHALM_1, "Kaby Lake HALO GT1" },
+	{ PCI_DID_INTEL_KBL_GT1_SHALM_2, "Kaby Lake HALO GT1" },
+	{ PCI_DID_INTEL_KBL_GT1_SSRVM, "Kaby Lake SRV GT1" },
+	{ PCI_DID_INTEL_KBL_GT2_SSRVM, "Kaby Lake Media Server GT2" },
+	{ PCI_DID_INTEL_KBL_GT2_SWSTM, "Kaby Lake Workstation GT2" },
+	{ PCI_DID_INTEL_KBL_GT2_SULXM, "Kaby Lake ULX GT2" },
+	{ PCI_DID_INTEL_KBL_GT2_SULTM, "Kaby Lake ULT GT2" },
+	{ PCI_DID_INTEL_KBL_GT2_SULTMR, "Kaby Lake-R ULT GT2" },
+	{ PCI_DID_INTEL_KBL_GT2_SHALM, "Kaby Lake HALO GT2" },
+	{ PCI_DID_INTEL_KBL_GT2_DT2P2, "Kaby Lake DT GT2" },
+	{ PCI_DID_INTEL_KBL_GT2F_SULTM, "Kaby Lake ULT GT2F" },
+	{ PCI_DID_INTEL_KBL_GT3E_SULTM_1, "Kaby Lake ULT (15W) GT3E" },
+	{ PCI_DID_INTEL_KBL_GT3E_SULTM_2, "Kaby Lake ULT (28W) GT3E" },
+	{ PCI_DID_INTEL_KBL_GT4_SHALM, "Kaby Lake HALO GT4" },
+	{ PCI_DID_INTEL_AML_GT2_ULX, "Amberlake ULX GT2" },
 };
 
 static uint8_t get_dev_revision(pci_devfn_t dev)