summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
authorMarc Jones <marcjones@sysproconsulting.com>2020-07-23 12:26:55 -0600
committerMarc Jones <marc@marcjonesconsulting.com>2020-10-03 03:35:59 +0000
commite2f6c7fb99ce0a5446d9b3a9e8fa2e871a548047 (patch)
treebf9d934e9bd14ad87d5f7925f9f3a1d600508354 /src/soc
parentb0e8c7c43799109b2147a02ebd1210e88beafd64 (diff)
soc/intel/xeon_sp/skx: Prepare acpi.* for merging
Clean up acpi.h in preparation for merging with cpx/ acpi.* files Change-Id: I2a0dc964eeb7f8da53676eb94c4385ff8668f6af Signed-off-by: Marc Jones <marcjones@sysproconsulting.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/45218 Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: Jay Talbott <JayTalbott@sysproconsulting.com> Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/intel/xeon_sp/skx/acpi.c4
-rw-r--r--src/soc/intel/xeon_sp/skx/include/soc/acpi.h5
2 files changed, 4 insertions, 5 deletions
diff --git a/src/soc/intel/xeon_sp/skx/acpi.c b/src/soc/intel/xeon_sp/skx/acpi.c
index d984d9f5e8..4797d9072f 100644
--- a/src/soc/intel/xeon_sp/skx/acpi.c
+++ b/src/soc/intel/xeon_sp/skx/acpi.c
@@ -82,7 +82,7 @@ unsigned long acpi_fill_mcfg(unsigned long current)
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 @@ unsigned long northbridge_write_acpi_tables(const struct device *device,
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 5506bb7575..4574d9c531 100644
--- a/src/soc/intel/xeon_sp/skx/include/soc/acpi.h
+++ b/src/soc/intel/xeon_sp/skx/include/soc/acpi.h
@@ -11,10 +11,9 @@ typedef struct {
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_ */