diff options
author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2020-05-30 16:16:28 +0300 |
---|---|---|
committer | Patrick Georgi <pgeorgi@google.com> | 2020-06-07 21:45:00 +0000 |
commit | f9aac92880829c5da2a594740142a4c98406d7f9 (patch) | |
tree | 8f3e4f3b6fe23439516414ace5eb6321fe122bb6 /src/soc/intel | |
parent | bf06c0fc46e795d18d2701ea497c26659f1d1eab (diff) | |
download | coreboot-f9aac92880829c5da2a594740142a4c98406d7f9.tar.xz |
acpi,soc/intel: Make soc/motherboard_fill_fadt() global
Change-Id: Iad7e7af802212d5445aed8bb08a55fd6c044d5bf
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/41916
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc/intel')
-rw-r--r-- | src/soc/intel/common/block/acpi/acpi.c | 6 | ||||
-rw-r--r-- | src/soc/intel/common/block/include/intelblocks/acpi.h | 3 | ||||
-rw-r--r-- | src/soc/intel/denverton_ns/acpi.c | 6 | ||||
-rw-r--r-- | src/soc/intel/denverton_ns/include/soc/acpi.h | 1 | ||||
-rw-r--r-- | src/soc/intel/xeon_sp/skx/acpi.c | 8 | ||||
-rw-r--r-- | src/soc/intel/xeon_sp/skx/include/soc/acpi.h | 1 |
6 files changed, 0 insertions, 25 deletions
diff --git a/src/soc/intel/common/block/acpi/acpi.c b/src/soc/intel/common/block/acpi/acpi.c index bda2399ac9..4e4906c5ad 100644 --- a/src/soc/intel/common/block/acpi/acpi.c +++ b/src/soc/intel/common/block/acpi/acpi.c @@ -89,10 +89,6 @@ unsigned long acpi_fill_madt(unsigned long current) return acpi_madt_irq_overrides(current); } -__weak void soc_fill_fadt(acpi_fadt_t *fadt) -{ -} - void acpi_fill_fadt(acpi_fadt_t *fadt) { const uint16_t pmbase = ACPI_BASE_ADDRESS; @@ -165,8 +161,6 @@ void acpi_fill_fadt(acpi_fadt_t *fadt) fadt->x_gpe0_blk.addrh = 0; fadt->x_gpe1_blk.space_id = 1; - - soc_fill_fadt(fadt); } unsigned long southbridge_write_acpi_tables(const struct device *device, diff --git a/src/soc/intel/common/block/include/intelblocks/acpi.h b/src/soc/intel/common/block/include/intelblocks/acpi.h index dde06c0a7c..19dd68af6c 100644 --- a/src/soc/intel/common/block/include/intelblocks/acpi.h +++ b/src/soc/intel/common/block/include/intelblocks/acpi.h @@ -63,9 +63,6 @@ acpi_tstate_t *soc_get_tss_table(int *entries); uint32_t acpi_fill_soc_wake(uint32_t generic_pm1_en, const struct chipset_power_state *ps); -/* Chipset specific settings for filling up fadt table */ -void soc_fill_fadt(acpi_fadt_t *fadt); - /* Chipset specific settings for filling up dmar table */ unsigned long sa_write_acpi_tables(const struct device *dev, unsigned long current, diff --git a/src/soc/intel/denverton_ns/acpi.c b/src/soc/intel/denverton_ns/acpi.c index 15d2e6611f..3b3e37a01b 100644 --- a/src/soc/intel/denverton_ns/acpi.c +++ b/src/soc/intel/denverton_ns/acpi.c @@ -113,10 +113,6 @@ unsigned long acpi_fill_mcfg(unsigned long current) return current; } -__attribute__ ((weak)) void motherboard_fill_fadt(acpi_fadt_t *fadt) -{ -} - void soc_fill_fadt(acpi_fadt_t *fadt) { u16 pmbase = get_pmbase(); @@ -220,8 +216,6 @@ void soc_fill_fadt(acpi_fadt_t *fadt) fadt->x_gpe1_blk.access_size = 0; fadt->x_gpe1_blk.addrl = fadt->gpe1_blk; fadt->x_gpe1_blk.addrh = 0x00; - - motherboard_fill_fadt(fadt); } static acpi_tstate_t denverton_tss_table[] = { diff --git a/src/soc/intel/denverton_ns/include/soc/acpi.h b/src/soc/intel/denverton_ns/include/soc/acpi.h index e6b303ec64..00700a6aab 100644 --- a/src/soc/intel/denverton_ns/include/soc/acpi.h +++ b/src/soc/intel/denverton_ns/include/soc/acpi.h @@ -13,6 +13,5 @@ unsigned long southcluster_write_acpi_tables(const struct device *device, unsigned long current, struct acpi_rsdp *rsdp); void southcluster_inject_dsdt(const struct device *device); -void motherboard_fill_fadt(acpi_fadt_t *fadt); #endif /* _DENVERTON_NS_ACPI_H_ */ diff --git a/src/soc/intel/xeon_sp/skx/acpi.c b/src/soc/intel/xeon_sp/skx/acpi.c index f5d4e7a188..3da2025e53 100644 --- a/src/soc/intel/xeon_sp/skx/acpi.c +++ b/src/soc/intel/xeon_sp/skx/acpi.c @@ -176,10 +176,6 @@ unsigned long acpi_fill_madt(unsigned long current) return acpi_madt_irq_overrides(current); } -__attribute__ ((weak)) void motherboard_fill_fadt(acpi_fadt_t *fadt) -{ -} - void generate_t_state_entries(int core, int cores_per_package) { } @@ -327,8 +323,6 @@ void soc_fill_fadt(acpi_fadt_t *fadt) fadt->x_gpe1_blk.access_size = 0; fadt->x_gpe1_blk.addrl = fadt->gpe1_blk; fadt->x_gpe1_blk.addrh = 0x00; - - motherboard_fill_fadt(fadt); } void acpi_fill_fadt(acpi_fadt_t *fadt) @@ -444,8 +438,6 @@ void acpi_fill_fadt(acpi_fadt_t *fadt) fadt->x_gpe1_blk.access_size = 0; fadt->x_gpe1_blk.addrl = 0x0; fadt->x_gpe1_blk.addrh = 0x0; - - soc_fill_fadt(fadt); } static acpi_tstate_t xeon_sp_tss_table[] = { 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 bd3187821f..c1d61c9025 100644 --- a/src/soc/intel/xeon_sp/skx/include/soc/acpi.h +++ b/src/soc/intel/xeon_sp/skx/include/soc/acpi.h @@ -18,6 +18,5 @@ void acpi_init_gnvs(global_nvs_t *gnvs); 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_ */ |