summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2021-03-16 13:11:05 +0100
committerPatrick Georgi <pgeorgi@google.com>2021-03-18 08:10:33 +0000
commit3419aaebf06195afb943b77a20d56e69bd8d2431 (patch)
tree4cf322c219ea61361d96a819757f9196c7140abc
parente69d2dfdb70c33dfcc07a54c217601f498c2214c (diff)
downloadcoreboot-3419aaebf06195afb943b77a20d56e69bd8d2431.tar.gz
coreboot-3419aaebf06195afb943b77a20d56e69bd8d2431.tar.bz2
coreboot-3419aaebf06195afb943b77a20d56e69bd8d2431.zip
cpu/qemu-x86: Add an option to use the smmloader v2
The idea is to get rid of having 2 different smmloaders so add this option only to qemu/q35 to get it buildtested. Change-Id: Id4901784c4044e945b7f258b3acdc8d549665f3a Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-on: https://review.coreboot.org/c/coreboot/+/51525 Reviewed-by: Angel Pons <th3fanbus@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--configs/config.emulation_qemu_x86_q35_smm_tseg4
-rw-r--r--src/cpu/qemu-x86/Kconfig14
2 files changed, 18 insertions, 0 deletions
diff --git a/configs/config.emulation_qemu_x86_q35_smm_tseg b/configs/config.emulation_qemu_x86_q35_smm_tseg
new file mode 100644
index 000000000000..6484c6c29cec
--- /dev/null
+++ b/configs/config.emulation_qemu_x86_q35_smm_tseg
@@ -0,0 +1,4 @@
+CONFIG_BOARD_EMULATION_QEMU_X86_Q35=y
+CONFIG_CPU_QEMU_X86_PARALLEL_MP=y
+CONFIG_CPU_QEMU_X86_TSEG_SMM=y
+CONFIG_CPU_QEMU_X86_SMMLOADERV2=y
diff --git a/src/cpu/qemu-x86/Kconfig b/src/cpu/qemu-x86/Kconfig
index 85f99e9cb653..d60f70fb482a 100644
--- a/src/cpu/qemu-x86/Kconfig
+++ b/src/cpu/qemu-x86/Kconfig
@@ -43,6 +43,20 @@ config CPU_QEMU_X86_TSEG_SMM
endchoice
+choice
+ prompt "SMM loader"
+ default CPU_QEMU_X86_SMMLOADERV1
+ depends on SMM_TSEG
+
+config CPU_QEMU_X86_SMMLOADERV1
+ bool "smmloader v1"
+
+config CPU_QEMU_X86_SMMLOADERV2
+ bool "smmloader v2"
+ select X86_SMM_LOADER_VERSION2
+
+endchoice
+
config MAX_CPUS
int
default 32 if SMM_TSEG