[coreboot-gerrit] Change in coreboot[master]: cpu/qemu-x86: Add the option to have no SMM

[Arthur Heymans (Code Review)]

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/48208 )

Change subject: cpu/qemu-x86: Add the option to have no SMM
......................................................................

cpu/qemu-x86: Add the option to have no SMM

Change-Id: I5526b19b8294042a49e5bca61036e47db01fd28a
Signed-off-by: Arthur Heymans 
---
M src/cpu/qemu-x86/Kconfig
M src/southbridge/intel/i82801ix/Kconfig
2 files changed, 20 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/48208/1

diff --git a/src/cpu/qemu-x86/Kconfig b/src/cpu/qemu-x86/Kconfig
index 87d02fc..8ccf437 100644
--- a/src/cpu/qemu-x86/Kconfig
+++ b/src/cpu/qemu-x86/Kconfig
@@ -5,10 +5,27 @@
    select UDELAY_TSC
    select TSC_MONOTONIC_TIMER
    select UNKNOWN_TSC_RATE
-	select SMM_ASEG

if CPU_QEMU_X86

+choice
+	prompt "SMM support"
+	default CPU_QEMU_X86_ASEG_SMM
+
+config CPU_QEMU_X86_NO_SMM
+	bool "No SMM"
+	select NO_SMM
+
+config CPU_QEMU_X86_ASEG_SMM
+	bool "SMM ASEG"
+	select SMM_ASEG
+
+#config CPU_QEMU_X86_TSEG_SMM
+#	bool "SMM TSEG"
+#	select SMM_TSEG
+
+endchoice
+
 config CPU_QEMU_X86_64
    bool "Experimental 64bit support"
    select ARCH_ALL_STAGES_X86_64
diff --git a/src/southbridge/intel/i82801ix/Kconfig b/src/southbridge/intel/i82801ix/Kconfig
index e1405cf..11a6d39 100644
--- a/src/southbridge/intel/i82801ix/Kconfig
+++ b/src/southbridge/intel/i82801ix/Kconfig
@@ -3,7 +3,7 @@
 config SOUTHBRIDGE_INTEL_I82801IX
    bool
    select ACPI_INTEL_HARDWARE_SLEEP_VALUES
-	select HAVE_SMI_HANDLER
+	select HAVE_SMI_HANDLER if !NO_SMM
    select HAVE_USBDEBUG_OPTIONS
    select INTEL_DESCRIPTOR_MODE_CAPABLE
    select IOAPIC
@@ -15,7 +15,7 @@
    select SOUTHBRIDGE_INTEL_COMMON_RTC
    select SOUTHBRIDGE_INTEL_COMMON_SMBUS
    select SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS
-	select SOUTHBRIDGE_INTEL_COMMON_SMM
+	select SOUTHBRIDGE_INTEL_COMMON_SMM if !NO_SMM
    select SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9 if !BOARD_EMULATION_QEMU_X86_Q35
    select SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG
    select SOUTHBRIDGE_INTEL_COMMON_WATCHDOG