Change in coreboot[master]: src/soc/intel: Add AML IGD in platform reporting

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/27846 )

Change subject: src/soc/intel: Add AML IGD in platform reporting
......................................................................

src/soc/intel: Add AML IGD in platform reporting

This patch revises IGD naming and adds AML IGD in platform reporting.

BUG=None
BRANCH=None
TEST=emerge-atlas coreboot chromeos-bootimage & Ensure AML IGD is shown
     in platform reporting.

Change-Id: Id8f8379703abdaa5b14a4337a4fca04b370f3a2a
Signed-off-by: Gaggery Tsai 
Reviewed-on: https://review.coreboot.org/27846
Tested-by: build bot (Jenkins) 
Reviewed-by: Subrata Banik 
Reviewed-by: Furquan Shaikh 
---
M src/include/device/pci_ids.h
M src/soc/intel/common/block/graphics/graphics.c
M src/soc/intel/skylake/bootblock/report_platform.c
M src/soc/intel/skylake/vr_config.c
4 files changed, 4 insertions(+), 3 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Furquan Shaikh: Looks good to me, approved
  Subrata Banik: Looks good to me, approved

diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h
index 7a26667..b3a8c57 100644
--- a/src/include/device/pci_ids.h
+++ b/src/include/device/pci_ids.h
@@ -2868,7 +2868,7 @@
 #define PCI_DEVICE_ID_INTEL_KBL_GT2_SULTM		0x5916
 #define PCI_DEVICE_ID_INTEL_KBL_GT2_SULTMR		0x5917
 #define PCI_DEVICE_ID_INTEL_KBL_GT2_SHALM		0x591B
-#define PCI_DEVICE_ID_INTEL_KBL_GT2_ULX_R		0x591C
+#define PCI_DEVICE_ID_INTEL_AML_GT2_ULX			0x591C
 #define PCI_DEVICE_ID_INTEL_APL_IGD_HD_505		0x5a84
 #define PCI_DEVICE_ID_INTEL_APL_IGD_HD_500		0x5a85
 #define PCI_DEVICE_ID_INTEL_GLK_IGD			0x3184
diff --git a/src/soc/intel/common/block/graphics/graphics.c b/src/soc/intel/common/block/graphics/graphics.c
index 1c31d73..c6ea7e2 100644
--- a/src/soc/intel/common/block/graphics/graphics.c
+++ b/src/soc/intel/common/block/graphics/graphics.c
@@ -124,7 +124,7 @@
    PCI_DEVICE_ID_INTEL_KBL_GT2_SULTMR,
    PCI_DEVICE_ID_INTEL_KBL_GT2_SHALM,
    PCI_DEVICE_ID_INTEL_KBL_GT2_DT2P2,
-	PCI_DEVICE_ID_INTEL_KBL_GT2_ULX_R,
+	PCI_DEVICE_ID_INTEL_AML_GT2_ULX,
    PCI_DEVICE_ID_INTEL_SKL_GT1_SULTM,
    PCI_DEVICE_ID_INTEL_SKL_GT2_SULXM,
    PCI_DEVICE_ID_INTEL_SKL_GT2_SULTM,
diff --git a/src/soc/intel/skylake/bootblock/report_platform.c b/src/soc/intel/skylake/bootblock/report_platform.c
index 7d5bc3f..a652b52 100644
--- a/src/soc/intel/skylake/bootblock/report_platform.c
+++ b/src/soc/intel/skylake/bootblock/report_platform.c
@@ -102,6 +102,7 @@
    { PCI_DEVICE_ID_INTEL_KBL_GT2_SULTMR, "Kabylake-R ULT GT2"},
    { PCI_DEVICE_ID_INTEL_KBL_GT2_SHALM, "Kabylake HALO GT2" },
    { PCI_DEVICE_ID_INTEL_KBL_GT2_DT2P2, "Kabylake DT GT2" },
+	{ PCI_DEVICE_ID_INTEL_AML_GT2_ULX, "Amberlake ULX GT2" },
 };

static uint8_t get_dev_revision(pci_devfn_t dev)
diff --git a/src/soc/intel/skylake/vr_config.c b/src/soc/intel/skylake/vr_config.c
index ce40e35..4508fda 100644
--- a/src/soc/intel/skylake/vr_config.c
+++ b/src/soc/intel/skylake/vr_config.c
@@ -186,7 +186,7 @@
    	sku = KBL_R_SKU;
    else if (id == PCI_DEVICE_ID_INTEL_KBL_ID_Y) {
    	id = get_dev_id(SA_DEV_IGD);
-		if (id == PCI_DEVICE_ID_INTEL_KBL_GT2_ULX_R)
+		if (id == PCI_DEVICE_ID_INTEL_AML_GT2_ULX)
    		sku = AML_Y_SKU;
    	else
    		sku = KBL_Y_SKU;