[coreboot-gerrit] Change in coreboot[master]: xeon_sp/skx: prepare acpi.* for merging

[Marc Jones (Code Review)]

Marc Jones has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/45218 )

Change subject: xeon_sp/skx: prepare acpi.* for merging
......................................................................

xeon_sp/skx: prepare acpi.* for merging

Cleanup acpi.h in preparation for merging with cpx/ acpi.* files

Change-Id: I2a0dc964eeb7f8da53676eb94c4385ff8668f6af
Signed-off-by: Marc Jones 
---
M src/soc/intel/xeon_sp/skx/acpi.c
M src/soc/intel/xeon_sp/skx/include/soc/acpi.h
2 files changed, 4 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/18/45218/1

diff --git a/src/soc/intel/xeon_sp/skx/acpi.c b/src/soc/intel/xeon_sp/skx/acpi.c
index d984d9f..4797d90 100644
--- a/src/soc/intel/xeon_sp/skx/acpi.c
+++ b/src/soc/intel/xeon_sp/skx/acpi.c
@@ -82,7 +82,7 @@
    return current;
 }

-unsigned long acpi_madt_irq_overrides(unsigned long current)
+static unsigned long acpi_madt_irq_overrides(unsigned long current)
 {
    int sci = acpi_sci_irq();
    uint16_t flags = MP_IRQ_TRIGGER_LEVEL;
@@ -747,7 +747,7 @@
    return current;
 }

-void uncore_inject_dsdt(void)
+static void uncore_inject_dsdt(void)
 {
    size_t hob_size;
    const uint8_t uds_guid[16] = FSP_HOB_IIO_UNIVERSAL_DATA_GUID;
diff --git a/src/soc/intel/xeon_sp/skx/include/soc/acpi.h b/src/soc/intel/xeon_sp/skx/include/soc/acpi.h
index 0e00c2b..354ffb4 100644
--- a/src/soc/intel/xeon_sp/skx/include/soc/acpi.h
+++ b/src/soc/intel/xeon_sp/skx/include/soc/acpi.h
@@ -12,10 +12,9 @@
    uint8_t   buf[32];
 } MEM_BLK;

-void acpi_create_serialio_ssdt(acpi_header_t *ssdt);
-unsigned long acpi_madt_irq_overrides(unsigned long current);
 unsigned long northbridge_write_acpi_tables(const struct device *device,
    unsigned long current, struct acpi_rsdp *rsdp);
-void uncore_inject_dsdt(void);
+
+void motherboard_fill_fadt(acpi_fadt_t *fadt);

#endif /* _SOC_ACPI_H_ */