<p>Patrick Rudolph has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/25722">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pci: Guard ACPI<br><br>Guard ACPI headers and functions with preprocessor directives.<br>Fixes compilation on non ACPI enabled platforms.<br><br>Change-Id: Iaff20463375d1e3ec573d9486a859a0514b0b390<br>Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com><br>---<br>M src/device/pci_device.c<br>M src/device/pci_rom.c<br>M src/include/device/pci_rom.h<br>3 files changed, 12 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/22/25722/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/device/pci_device.c b/src/device/pci_device.c</span><br><span>index c18f529..539c2a3 100644</span><br><span>--- a/src/device/pci_device.c</span><br><span>+++ b/src/device/pci_device.c</span><br><span>@@ -30,8 +30,9 @@</span><br><span> /*</span><br><span>  * PCI Bus Services, see include/linux/pci.h for further explanation.</span><br><span>  */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)</span><br><span> #include <arch/acpi.h></span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> #include <arch/io.h></span><br><span> #include <bootmode.h></span><br><span> #include <console/console.h></span><br><span>@@ -695,9 +696,11 @@</span><br><span>   /* If S3_VGA_ROM_RUN is disabled, skip running VGA option</span><br><span>     * ROMs when coming out of an S3 resume.</span><br><span>      */</span><br><span style="color: hsl(120, 100%, 40%);">+#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)</span><br><span>         if (!IS_ENABLED(CONFIG_S3_VGA_ROM_RUN) && acpi_is_wakeup_s3() &&</span><br><span>             ((dev->class >> 8) == PCI_CLASS_DISPLAY_VGA))</span><br><span>               return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span>    if (IS_ENABLED(CONFIG_ALWAYS_LOAD_OPROM))</span><br><span>            return 1;</span><br><span>    if (should_run_oprom(dev))</span><br><span>diff --git a/src/device/pci_rom.c b/src/device/pci_rom.c</span><br><span>index 15b0c4c..d772884 100644</span><br><span>--- a/src/device/pci_rom.c</span><br><span>+++ b/src/device/pci_rom.c</span><br><span>@@ -26,7 +26,9 @@</span><br><span> #include <string.h></span><br><span> #include <cbfs.h></span><br><span> #include <cbmem.h></span><br><span style="color: hsl(120, 100%, 40%);">+#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)</span><br><span> #include <arch/acpigen.h></span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> </span><br><span> /* Rmodules don't like weak symbols. */</span><br><span> u32 __attribute__((weak)) map_oprom_vendev(u32 vendev) { return vendev; }</span><br><span>diff --git a/src/include/device/pci_rom.h b/src/include/device/pci_rom.h</span><br><span>index a4aa52a..dc9f97b 100644</span><br><span>--- a/src/include/device/pci_rom.h</span><br><span>+++ b/src/include/device/pci_rom.h</span><br><span>@@ -2,7 +2,9 @@</span><br><span> #define PCI_ROM_H</span><br><span> #include <endian.h></span><br><span> #include <stddef.h></span><br><span style="color: hsl(120, 100%, 40%);">+#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)</span><br><span> #include <arch/acpi.h></span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> </span><br><span> #define PCI_ROM_HDR 0xAA55</span><br><span> #define PCI_DATA_HDR ((uint32_t) (('R' << 24) | ('I' << 16) | ('C' << 8) | 'P'))</span><br><span>@@ -38,10 +40,12 @@</span><br><span> struct rom_header *pci_rom_load(struct device *dev,</span><br><span>      struct rom_header *rom_header);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)</span><br><span> unsigned long</span><br><span> pci_rom_write_acpi_tables(struct device *device,</span><br><span style="color: hsl(0, 100%, 40%);">-                                                 unsigned long current,</span><br><span style="color: hsl(0, 100%, 40%);">-                                                  struct acpi_rsdp *rsdp);</span><br><span style="color: hsl(120, 100%, 40%);">+                      unsigned long current,</span><br><span style="color: hsl(120, 100%, 40%);">+                        struct acpi_rsdp *rsdp);</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> </span><br><span> void pci_rom_ssdt(struct device *device);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/25722">change 25722</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/25722"/><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: Iaff20463375d1e3ec573d9486a859a0514b0b390 </div>
<div style="display:none"> Gerrit-Change-Number: 25722 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Patrick Rudolph <patrick.rudolph@9elements.com> </div>