<p>Subrata Banik has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26465">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/intel/cannonlake: Select common XHCI code<br><br>This patch select CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI to include<br>common xhci code block.<br><br>BUG=b:78109109<br>BRANCH=none<br>TEST=Build and boot cnlrvp<br><br>Change-Id: I7f1e59792159dae5835fbbe7fcb1604fc01893ba<br>Signed-off-by: Subrata Banik <subrata.banik@intel.com><br>---<br>M src/soc/intel/cannonlake/Kconfig<br>M src/soc/intel/cannonlake/chip.c<br>M src/soc/intel/common/block/xhci/xhci.c<br>3 files changed, 5 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/65/26465/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/soc/intel/cannonlake/Kconfig b/src/soc/intel/cannonlake/Kconfig</span><br><span>index ecb9bcb..2a42523 100644</span><br><span>--- a/src/soc/intel/cannonlake/Kconfig</span><br><span>+++ b/src/soc/intel/cannonlake/Kconfig</span><br><span>@@ -72,6 +72,7 @@</span><br><span>     select SOC_INTEL_COMMON_BLOCK_TIMER</span><br><span>  select SOC_INTEL_COMMON_BLOCK_UART</span><br><span>   select SOC_INTEL_COMMON_BLOCK_XDCI</span><br><span style="color: hsl(120, 100%, 40%);">+    select SOC_INTEL_COMMON_BLOCK_XHCI</span><br><span>   select SOC_INTEL_COMMON_NHLT</span><br><span>         select SOC_INTEL_COMMON_RESET</span><br><span>        select SSE2</span><br><span>diff --git a/src/soc/intel/cannonlake/chip.c b/src/soc/intel/cannonlake/chip.c</span><br><span>index b64d804..fd9ce52 100644</span><br><span>--- a/src/soc/intel/cannonlake/chip.c</span><br><span>+++ b/src/soc/intel/cannonlake/chip.c</span><br><span>@@ -20,6 +20,7 @@</span><br><span> #include <device/pci.h></span><br><span> #include <fsp/api.h></span><br><span> #include <fsp/util.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <intelblocks/acpi.h></span><br><span> #include <intelblocks/xdci.h></span><br><span> #include <romstage_handoff.h></span><br><span> #include <soc/intel/common/vbt.h></span><br><span>@@ -28,7 +29,7 @@</span><br><span> #include <string.h></span><br><span> </span><br><span> #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)</span><br><span style="color: hsl(0, 100%, 40%);">-static const char *soc_acpi_name(const struct device *dev)</span><br><span style="color: hsl(120, 100%, 40%);">+const char *soc_acpi_name(const struct device *dev)</span><br><span> {</span><br><span>     if (dev->path.type == DEVICE_PATH_DOMAIN)</span><br><span>                 return "PCI0";</span><br><span>diff --git a/src/soc/intel/common/block/xhci/xhci.c b/src/soc/intel/common/block/xhci/xhci.c</span><br><span>index d764262..c38d19f 100644</span><br><span>--- a/src/soc/intel/common/block/xhci/xhci.c</span><br><span>+++ b/src/soc/intel/common/block/xhci/xhci.c</span><br><span>@@ -31,7 +31,9 @@</span><br><span>    .init                   = soc_xhci_init,</span><br><span>     .ops_pci                = &pci_dev_ops_pci,</span><br><span>      .scan_bus               = &scan_usb_bus,</span><br><span style="color: hsl(120, 100%, 40%);">+#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)</span><br><span>        .acpi_name              = &soc_acpi_name,</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> };</span><br><span> </span><br><span> static const unsigned short pci_device_ids[] = {</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26465">change 26465</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/26465"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I7f1e59792159dae5835fbbe7fcb1604fc01893ba </div>
<div style="display:none"> Gerrit-Change-Number: 26465 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Subrata Banik <subrata.banik@intel.com> </div>