summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
authorMartin Roth <martinroth@google.com>2015-11-26 17:46:45 -0700
committerMartin Roth <martinroth@google.com>2015-11-30 23:52:51 +0100
commitbd88fa0ef62339bfc3027423d230a6ffcd1419ae (patch)
tree39b943805837dff20c149d7513cf57c9554f1411 /src/soc
parent4013469c507847d48e891c16b92f4556a2f6b76f (diff)
downloadcoreboot-bd88fa0ef62339bfc3027423d230a6ffcd1419ae.tar.xz
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 <martinroth@google.com> Reviewed-on: https://review.coreboot.org/12553 Tested-by: build bot (Jenkins) Reviewed-by: Werner Zeh <werner.zeh@siemens.com> Reviewed-by: Ben Gardner <gardner.ben@gmail.com>
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/intel/fsp_baytrail/Kconfig1
-rw-r--r--src/soc/intel/fsp_baytrail/acpi.c11
2 files changed, 2 insertions, 10 deletions
diff --git a/src/soc/intel/fsp_baytrail/Kconfig b/src/soc/intel/fsp_baytrail/Kconfig
index 2325d75838..506e731f9f 100644
--- a/src/soc/intel/fsp_baytrail/Kconfig
+++ b/src/soc/intel/fsp_baytrail/Kconfig
@@ -35,7 +35,6 @@ config CPU_SPECIFIC_OPTIONS
select PARALLEL_MP
select REG_SCRIPT
select SMM_TSEG
- select BAYTRAIL_SMM
select SMP
select SPI_FLASH
select SSE2
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 <arch/acpigen.h>
#include <arch/cpu.h>
#include <cpu/x86/msr.h>
+#include <cpu/x86/smm.h>
#include <cpu/intel/speedstep.h>
#include <cpu/intel/turbo.h>
#include <arch/smp/mpspec.h>
@@ -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;