diff --git a/src/soc/intel/tigerlake/bootblock/report_platform.c b/src/soc/intel/tigerlake/bootblock/report_platform.c
index 109ab60..af7a96a 100644
--- a/src/soc/intel/tigerlake/bootblock/report_platform.c
+++ b/src/soc/intel/tigerlake/bootblock/report_platform.c
@@ -32,72 +32,72 @@
 	u16 mchid;
 	const char *name;
 } mch_table[] = {
-	{ PCI_DEVICE_ID_INTEL_TGL_ID_U_2_2, "Tigerlake-U-2-2" },
-	{ PCI_DEVICE_ID_INTEL_TGL_ID_U_4_2, "Tigerlake-U-4-2" },
-	{ PCI_DEVICE_ID_INTEL_TGL_ID_Y_2_2, "Tigerlake-Y-2-2" },
-	{ PCI_DEVICE_ID_INTEL_TGL_ID_Y_4_2, "Tigerlake-Y-4-2" },
-	{ PCI_DEVICE_ID_INTEL_TGL_ID_H_6_1, "Tigerlake-H-6-1" },
-	{ PCI_DEVICE_ID_INTEL_TGL_ID_H_8_1, "Tigerlake-H-8-1" },
+	{ PCI_DID_INTEL_TGL_ID_U_2_2, "Tigerlake-U-2-2" },
+	{ PCI_DID_INTEL_TGL_ID_U_4_2, "Tigerlake-U-4-2" },
+	{ PCI_DID_INTEL_TGL_ID_Y_2_2, "Tigerlake-Y-2-2" },
+	{ PCI_DID_INTEL_TGL_ID_Y_4_2, "Tigerlake-Y-4-2" },
+	{ PCI_DID_INTEL_TGL_ID_H_6_1, "Tigerlake-H-6-1" },
+	{ PCI_DID_INTEL_TGL_ID_H_8_1, "Tigerlake-H-8-1" },
 };
 
 static struct {
 	u16 espiid;
 	const char *name;
 } pch_table[] = {
-	{ PCI_DEVICE_ID_INTEL_TGP_ESPI_0, "Tigerlake-Base SKU" },
-	{ PCI_DEVICE_ID_INTEL_TGP_SUPER_U_ESPI, "Tigerlake-U Super SKU" },
-	{ PCI_DEVICE_ID_INTEL_TGP_PREMIUM_U_ESPI, "Tigerlake-U Premium SKU" },
-	{ PCI_DEVICE_ID_INTEL_TGP_BASE_U_ESPI, "Tigerlake-U Base SKU" },
-	{ PCI_DEVICE_ID_INTEL_TGP_ESPI_1, "Tigerlake-Base SKU" },
-	{ PCI_DEVICE_ID_INTEL_TGP_ESPI_2, "Tigerlake-Base SKU" },
-	{ PCI_DEVICE_ID_INTEL_TGP_SUPER_Y_ESPI, "Tigerlake-Y Super SKU" },
-	{ PCI_DEVICE_ID_INTEL_TGP_PREMIUM_Y_ESPI, "Tigerlake-Y Premium SKU" },
-	{ PCI_DEVICE_ID_INTEL_TGP_ESPI_3, "Tigerlake-Base SKU" },
-	{ PCI_DEVICE_ID_INTEL_TGP_ESPI_4, "Tigerlake-Base SKU" },
-	{ PCI_DEVICE_ID_INTEL_TGP_ESPI_5, "Tigerlake-Base SKU" },
-	{ PCI_DEVICE_ID_INTEL_TGP_ESPI_6, "Tigerlake-Base SKU" },
-	{ PCI_DEVICE_ID_INTEL_TGP_ESPI_7, "Tigerlake-Base SKU" },
-	{ PCI_DEVICE_ID_INTEL_TGP_ESPI_8, "Tigerlake-Base SKU" },
-	{ PCI_DEVICE_ID_INTEL_TGP_ESPI_9, "Tigerlake-Base SKU" },
-	{ PCI_DEVICE_ID_INTEL_TGP_ESPI_10, "Tigerlake-Base SKU" },
-	{ PCI_DEVICE_ID_INTEL_TGP_ESPI_11, "Tigerlake-Base SKU" },
-	{ PCI_DEVICE_ID_INTEL_TGP_ESPI_12, "Tigerlake-Base SKU" },
-	{ PCI_DEVICE_ID_INTEL_TGP_ESPI_13, "Tigerlake-Base SKU" },
-	{ PCI_DEVICE_ID_INTEL_TGP_ESPI_14, "Tigerlake-Base SKU" },
-	{ PCI_DEVICE_ID_INTEL_TGP_ESPI_15, "Tigerlake-Base SKU" },
-	{ PCI_DEVICE_ID_INTEL_TGP_ESPI_16, "Tigerlake-Base SKU" },
-	{ PCI_DEVICE_ID_INTEL_TGP_ESPI_17, "Tigerlake-Base SKU" },
-	{ PCI_DEVICE_ID_INTEL_TGP_ESPI_18, "Tigerlake-Base SKU" },
-	{ PCI_DEVICE_ID_INTEL_TGP_ESPI_19, "Tigerlake-Base SKU" },
-	{ PCI_DEVICE_ID_INTEL_TGP_ESPI_20, "Tigerlake-Base SKU" },
-	{ PCI_DEVICE_ID_INTEL_TGP_ESPI_21, "Tigerlake-Base SKU" },
-	{ PCI_DEVICE_ID_INTEL_TGP_ESPI_22, "Tigerlake-Base SKU" },
-	{ PCI_DEVICE_ID_INTEL_TGP_ESPI_23, "Tigerlake-Base SKU" },
-	{ PCI_DEVICE_ID_INTEL_TGP_ESPI_24, "Tigerlake-Base SKU" },
-	{ PCI_DEVICE_ID_INTEL_TGP_ESPI_25, "Tigerlake-Base SKU" },
-	{ PCI_DEVICE_ID_INTEL_TGP_ESPI_26, "Tigerlake-Base SKU" },
-	{ PCI_DEVICE_ID_INTEL_TGP_H_ESPI_B560, "Tigerlake-H B560" },
-	{ PCI_DEVICE_ID_INTEL_TGP_H_ESPI_H510, "Tigerlake-H H510" },
-	{ PCI_DEVICE_ID_INTEL_TGP_H_ESPI_H570, "Tigerlake-H H570" },
-	{ PCI_DEVICE_ID_INTEL_TGP_H_ESPI_Q570, "Tigerlake-H Q570" },
-	{ PCI_DEVICE_ID_INTEL_TGP_H_ESPI_W580, "Tigerlake-H W580" },
-	{ PCI_DEVICE_ID_INTEL_TGP_H_ESPI_Z590, "Tigerlake-H Z590" },
-	{ PCI_DEVICE_ID_INTEL_TGP_H_ESPI_HM570, "Tigerlake-H HM570" },
-	{ PCI_DEVICE_ID_INTEL_TGP_H_ESPI_QM580, "Tigerlake-H QM580" },
-	{ PCI_DEVICE_ID_INTEL_TGP_H_ESPI_WM590, "Tigerlake-H WM590" },
+	{ PCI_DID_INTEL_TGP_ESPI_0, "Tigerlake-Base SKU" },
+	{ PCI_DID_INTEL_TGP_SUPER_U_ESPI, "Tigerlake-U Super SKU" },
+	{ PCI_DID_INTEL_TGP_PREMIUM_U_ESPI, "Tigerlake-U Premium SKU" },
+	{ PCI_DID_INTEL_TGP_BASE_U_ESPI, "Tigerlake-U Base SKU" },
+	{ PCI_DID_INTEL_TGP_ESPI_1, "Tigerlake-Base SKU" },
+	{ PCI_DID_INTEL_TGP_ESPI_2, "Tigerlake-Base SKU" },
+	{ PCI_DID_INTEL_TGP_SUPER_Y_ESPI, "Tigerlake-Y Super SKU" },
+	{ PCI_DID_INTEL_TGP_PREMIUM_Y_ESPI, "Tigerlake-Y Premium SKU" },
+	{ PCI_DID_INTEL_TGP_ESPI_3, "Tigerlake-Base SKU" },
+	{ PCI_DID_INTEL_TGP_ESPI_4, "Tigerlake-Base SKU" },
+	{ PCI_DID_INTEL_TGP_ESPI_5, "Tigerlake-Base SKU" },
+	{ PCI_DID_INTEL_TGP_ESPI_6, "Tigerlake-Base SKU" },
+	{ PCI_DID_INTEL_TGP_ESPI_7, "Tigerlake-Base SKU" },
+	{ PCI_DID_INTEL_TGP_ESPI_8, "Tigerlake-Base SKU" },
+	{ PCI_DID_INTEL_TGP_ESPI_9, "Tigerlake-Base SKU" },
+	{ PCI_DID_INTEL_TGP_ESPI_10, "Tigerlake-Base SKU" },
+	{ PCI_DID_INTEL_TGP_ESPI_11, "Tigerlake-Base SKU" },
+	{ PCI_DID_INTEL_TGP_ESPI_12, "Tigerlake-Base SKU" },
+	{ PCI_DID_INTEL_TGP_ESPI_13, "Tigerlake-Base SKU" },
+	{ PCI_DID_INTEL_TGP_ESPI_14, "Tigerlake-Base SKU" },
+	{ PCI_DID_INTEL_TGP_ESPI_15, "Tigerlake-Base SKU" },
+	{ PCI_DID_INTEL_TGP_ESPI_16, "Tigerlake-Base SKU" },
+	{ PCI_DID_INTEL_TGP_ESPI_17, "Tigerlake-Base SKU" },
+	{ PCI_DID_INTEL_TGP_ESPI_18, "Tigerlake-Base SKU" },
+	{ PCI_DID_INTEL_TGP_ESPI_19, "Tigerlake-Base SKU" },
+	{ PCI_DID_INTEL_TGP_ESPI_20, "Tigerlake-Base SKU" },
+	{ PCI_DID_INTEL_TGP_ESPI_21, "Tigerlake-Base SKU" },
+	{ PCI_DID_INTEL_TGP_ESPI_22, "Tigerlake-Base SKU" },
+	{ PCI_DID_INTEL_TGP_ESPI_23, "Tigerlake-Base SKU" },
+	{ PCI_DID_INTEL_TGP_ESPI_24, "Tigerlake-Base SKU" },
+	{ PCI_DID_INTEL_TGP_ESPI_25, "Tigerlake-Base SKU" },
+	{ PCI_DID_INTEL_TGP_ESPI_26, "Tigerlake-Base SKU" },
+	{ PCI_DID_INTEL_TGP_H_ESPI_B560, "Tigerlake-H B560" },
+	{ PCI_DID_INTEL_TGP_H_ESPI_H510, "Tigerlake-H H510" },
+	{ PCI_DID_INTEL_TGP_H_ESPI_H570, "Tigerlake-H H570" },
+	{ PCI_DID_INTEL_TGP_H_ESPI_Q570, "Tigerlake-H Q570" },
+	{ PCI_DID_INTEL_TGP_H_ESPI_W580, "Tigerlake-H W580" },
+	{ PCI_DID_INTEL_TGP_H_ESPI_Z590, "Tigerlake-H Z590" },
+	{ PCI_DID_INTEL_TGP_H_ESPI_HM570, "Tigerlake-H HM570" },
+	{ PCI_DID_INTEL_TGP_H_ESPI_QM580, "Tigerlake-H QM580" },
+	{ PCI_DID_INTEL_TGP_H_ESPI_WM590, "Tigerlake-H WM590" },
 };
 
 static struct {
 	u16 igdid;
 	const char *name;
 } igd_table[] = {
-	{ PCI_DEVICE_ID_INTEL_TGL_GT0, "Tigerlake U GT0" },
-	{ PCI_DEVICE_ID_INTEL_TGL_GT1_H_32, "Tigerlake H GT1 32EU" },
-	{ PCI_DEVICE_ID_INTEL_TGL_GT1_H_16, "Tigerlake H GT1 16EU" },
-	{ PCI_DEVICE_ID_INTEL_TGL_GT2_ULT, "Tigerlake U GT2" },
-	{ PCI_DEVICE_ID_INTEL_TGL_GT2_ULX, "Tigerlake Y GT2" },
-	{ PCI_DEVICE_ID_INTEL_TGL_GT3_ULT, "Tigerlake U GT3" },
-	{ PCI_DEVICE_ID_INTEL_TGL_GT2_ULT_1, "Tigerlake U GT2 1" },
+	{ PCI_DID_INTEL_TGL_GT0, "Tigerlake U GT0" },
+	{ PCI_DID_INTEL_TGL_GT1_H_32, "Tigerlake H GT1 32EU" },
+	{ PCI_DID_INTEL_TGL_GT1_H_16, "Tigerlake H GT1 16EU" },
+	{ PCI_DID_INTEL_TGL_GT2_ULT, "Tigerlake U GT2" },
+	{ PCI_DID_INTEL_TGL_GT2_ULX, "Tigerlake Y GT2" },
+	{ PCI_DID_INTEL_TGL_GT3_ULT, "Tigerlake U GT3" },
+	{ PCI_DID_INTEL_TGL_GT2_ULT_1, "Tigerlake U GT2 1" },
 };
 
 static inline uint8_t get_dev_revision(pci_devfn_t dev)