Martin Roth has uploaded a new change for review. ( https://review.coreboot.org/19601 )
Change subject: intel/common/block: Fix incorrect defines ......................................................................
intel/common/block: Fix incorrect defines
These #defines were part of a patch train where they were changed from ...APOLLOLAKE... to ...APL... Unfortunately, the follow-on commits in the train were not updated or rebased, so this issue wasn't caught until they were merged.
Change-Id: I711f96e1d6c88ec207b29898a747337beee87c50 Signed-off-by: Martin Roth martinroth@google.com --- M src/soc/intel/common/block/cse/cse.c M src/soc/intel/common/block/xhci/xhci.c 2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/01/19601/1
diff --git a/src/soc/intel/common/block/cse/cse.c b/src/soc/intel/common/block/cse/cse.c index 272fe7a..f05d9f4 100644 --- a/src/soc/intel/common/block/cse/cse.c +++ b/src/soc/intel/common/block/cse/cse.c @@ -471,7 +471,7 @@ .ops = &cse_ops, .vendor = PCI_VENDOR_ID_INTEL, /* SoC/chipset needs to provide PCI device ID */ - .device = PCI_DEVICE_ID_INTEL_APOLLOLAKE_CSE0 + .device = PCI_DEVICE_ID_INTEL_APL_CSE0 };
#endif diff --git a/src/soc/intel/common/block/xhci/xhci.c b/src/soc/intel/common/block/xhci/xhci.c index d1f7579..50fe1de 100644 --- a/src/soc/intel/common/block/xhci/xhci.c +++ b/src/soc/intel/common/block/xhci/xhci.c @@ -30,7 +30,7 @@ };
static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_APOLLOLAKE_XHCI, + PCI_DEVICE_ID_INTEL_APL_XHCI, PCI_DEVICE_ID_INTEL_GLK_XHCI, PCI_DEVICE_ID_INTEL_SPT_LP_XHCI, PCI_DEVICE_ID_INTEL_KBP_H_XHCI,