diff options
| author | Vladimir Serbinenko <phcoder@gmail.com> | 2014-11-09 13:30:50 +0100 |
|---|---|---|
| committer | Vladimir Serbinenko <phcoder@gmail.com> | 2015-05-26 10:25:47 +0200 |
| commit | 83f81cad7a1faf40dd894924963fc8bfc5904aea (patch) | |
| tree | 5b479c12fc99a617254baaf711308589d0d1072e /src/arch | |
| parent | e288758b0388f11650ca080dfda674bf31ba2268 (diff) | |
acpi: Remove monolithic ACPI
All boards now use per-device ACPI. This patch finishes migration
by removing transitional kludges.
Change-Id: Ie4577f89bf3bb17b310b7b0a84b2c54e404b1606
Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
Reviewed-on: http://review.coreboot.org/7372
Tested-by: build bot (Jenkins)
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Diffstat (limited to 'src/arch')
| -rw-r--r-- | src/arch/x86/boot/acpi.c | 19 | ||||
| -rw-r--r-- | src/arch/x86/include/arch/acpi.h | 4 |
2 files changed, 0 insertions, 23 deletions
diff --git a/src/arch/x86/boot/acpi.c b/src/arch/x86/boot/acpi.c index b2e0df3687..07b67d05eb 100644 --- a/src/arch/x86/boot/acpi.c +++ b/src/arch/x86/boot/acpi.c @@ -249,18 +249,6 @@ void acpi_create_mcfg(acpi_mcfg_t *mcfg) header->checksum = acpi_checksum((void *)mcfg, header->length); } -#if !IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES) -/* - * This can be overridden by platform ACPI setup code, if it calls - * acpi_create_ssdt_generator(). - */ -unsigned long __attribute__((weak)) acpi_fill_ssdt_generator( - unsigned long current, const char *oem_table_id) -{ - return current; -} -#endif - void acpi_create_ssdt_generator(acpi_header_t *ssdt, const char *oem_table_id) { unsigned long current = (unsigned long)ssdt + sizeof(acpi_header_t); @@ -278,16 +266,12 @@ void acpi_create_ssdt_generator(acpi_header_t *ssdt, const char *oem_table_id) acpigen_set_current((char *) current); { -#if IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES) struct device *dev; for (dev = all_devices; dev; dev = dev->next) if (dev->ops && dev->ops->acpi_fill_ssdt_generator) { dev->ops->acpi_fill_ssdt_generator(); } current = (unsigned long) acpigen_get_current(); -#else - current = acpi_fill_ssdt_generator(current, oem_table_id); -#endif } /* (Re)calculate length and checksum. */ @@ -686,8 +670,6 @@ void acpi_create_fadt(acpi_fadt_t *fadt,acpi_facs_t *facs, void *dsdt) } #endif -#if IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES) - extern const unsigned char AmlCode[]; unsigned long __attribute__ ((weak)) fw_cfg_acpi_tables(unsigned long start) @@ -830,7 +812,6 @@ unsigned long write_acpi_tables(unsigned long start) printk(BIOS_INFO, "ACPI: done.\n"); return current; } -#endif #if CONFIG_HAVE_ACPI_RESUME void __attribute__((weak)) mainboard_suspend_resume(void) diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h index 067a26ad84..60d5a0277d 100644 --- a/src/arch/x86/include/arch/acpi.h +++ b/src/arch/x86/include/arch/acpi.h @@ -489,10 +489,6 @@ unsigned long fw_cfg_acpi_tables(unsigned long start); unsigned long write_acpi_tables(unsigned long addr); unsigned long acpi_fill_madt(unsigned long current); unsigned long acpi_fill_mcfg(unsigned long current); -#if !IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES) -unsigned long acpi_fill_ssdt_generator(unsigned long current, - const char *oem_table_id); -#endif void acpi_create_ssdt_generator(acpi_header_t *ssdt, const char *oem_table_id); void acpi_create_fadt(acpi_fadt_t *fadt,acpi_facs_t *facs, void *dsdt); #if IS_ENABLED(CONFIG_COMMON_FADT) |