From bd88fa0ef62339bfc3027423d230a6ffcd1419ae Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Thu, 26 Nov 2015 17:46:45 -0700 Subject: fsp_baytrail: Remove use of BAYTRAIL_SMM Kconfig symbol The symbol BAYTRAIL_SMM was never valid (there's no config statment initializing the symbol), but it was being selected and used in the code. Now that SMM is supported in fsp_baytrail, the code it was trying to switch can be removed, and just set up for SMM. Change-Id: I0fd4865a951734e728500e7baf593ff7eb556f73 Signed-off-by: Martin Roth Reviewed-on: https://review.coreboot.org/12553 Tested-by: build bot (Jenkins) Reviewed-by: Werner Zeh Reviewed-by: Ben Gardner --- src/soc/intel/fsp_baytrail/acpi.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/soc/intel/fsp_baytrail/acpi.c') diff --git a/src/soc/intel/fsp_baytrail/acpi.c b/src/soc/intel/fsp_baytrail/acpi.c index 5a5b880168..b9258729a8 100644 --- a/src/soc/intel/fsp_baytrail/acpi.c +++ b/src/soc/intel/fsp_baytrail/acpi.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -208,18 +209,10 @@ void acpi_fill_in_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) /* System Management */ fadt->sci_int = acpi_sci_irq(); -#if IS_ENABLED(CONFIG_BAYTRAIL_SMM) + fadt->smi_cmd = APM_CNT; fadt->acpi_enable = APM_CNT_ACPI_ENABLE; fadt->acpi_disable = APM_CNT_ACPI_DISABLE; -#else - fadt->smi_cmd = 0x00; /* disable SMM */ - fadt->acpi_enable = 0x00; /* unused if SMI_CMD = 0 */ - fadt->acpi_disable = 0x00; /* unused if SMI_CMD = 0 */ - - /* Enable ACPI */ - outl(inl(pmbase + 4) | 0x01, pmbase + 4); -#endif /* Power Control */ fadt->s4bios_req = 0x00; -- cgit v1.2.3