Angel Pons has uploaded this change for review.
cpu/x86: Introduce `CPU_X86_SMM`
There's no need for relative paths with Kconfig options.
Change-Id: I478d3fd37d9f9c0daa4a704fdf5ba92b2028bf43
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
---
M src/cpu/amd/agesa/family14/Kconfig
M src/cpu/amd/agesa/family14/Makefile.inc
M src/cpu/amd/agesa/family15tn/Kconfig
M src/cpu/amd/agesa/family15tn/Makefile.inc
M src/cpu/amd/agesa/family16kb/Kconfig
M src/cpu/amd/agesa/family16kb/Makefile.inc
M src/cpu/amd/pi/00630F01/Kconfig
M src/cpu/amd/pi/00630F01/Makefile.inc
M src/cpu/amd/pi/00660F01/Kconfig
M src/cpu/amd/pi/00660F01/Makefile.inc
M src/cpu/amd/pi/00730F01/Kconfig
M src/cpu/amd/pi/00730F01/Makefile.inc
M src/cpu/intel/haswell/Kconfig
M src/cpu/intel/haswell/Makefile.inc
M src/cpu/intel/model_2065x/Kconfig
M src/cpu/intel/model_2065x/Makefile.inc
M src/cpu/intel/model_206ax/Kconfig
M src/cpu/intel/model_206ax/Makefile.inc
M src/cpu/intel/slot_1/Kconfig
M src/cpu/intel/slot_1/Makefile.inc
M src/cpu/intel/socket_441/Kconfig
M src/cpu/intel/socket_441/Makefile.inc
M src/cpu/intel/socket_BGA956/Kconfig
M src/cpu/intel/socket_BGA956/Makefile.inc
M src/cpu/intel/socket_FCBGA559/Kconfig
M src/cpu/intel/socket_FCBGA559/Makefile.inc
M src/cpu/intel/socket_LGA775/Kconfig
M src/cpu/intel/socket_LGA775/Makefile.inc
M src/cpu/intel/socket_m/Kconfig
M src/cpu/intel/socket_m/Makefile.inc
M src/cpu/intel/socket_mPGA604/Kconfig
M src/cpu/intel/socket_mPGA604/Makefile.inc
M src/cpu/intel/socket_p/Kconfig
M src/cpu/intel/socket_p/Makefile.inc
M src/cpu/qemu-x86/Kconfig
M src/cpu/qemu-x86/Makefile.inc
M src/cpu/x86/Kconfig
M src/cpu/x86/Makefile.inc
M src/soc/amd/picasso/Kconfig
M src/soc/amd/picasso/Makefile.inc
M src/soc/amd/stoneyridge/Kconfig
M src/soc/amd/stoneyridge/Makefile.inc
M src/soc/intel/apollolake/Kconfig
M src/soc/intel/apollolake/Makefile.inc
M src/soc/intel/baytrail/Kconfig
M src/soc/intel/baytrail/Makefile.inc
M src/soc/intel/braswell/Kconfig
M src/soc/intel/braswell/Makefile.inc
M src/soc/intel/broadwell/Kconfig
M src/soc/intel/broadwell/Makefile.inc
M src/soc/intel/cannonlake/Kconfig
M src/soc/intel/cannonlake/Makefile.inc
M src/soc/intel/denverton_ns/Kconfig
M src/soc/intel/denverton_ns/Makefile.inc
M src/soc/intel/icelake/Kconfig
M src/soc/intel/icelake/Makefile.inc
M src/soc/intel/jasperlake/Kconfig
M src/soc/intel/jasperlake/Makefile.inc
M src/soc/intel/skylake/Kconfig
M src/soc/intel/skylake/Makefile.inc
M src/soc/intel/tigerlake/Kconfig
M src/soc/intel/tigerlake/Makefile.inc
M src/soc/intel/xeon_sp/Kconfig
M src/soc/intel/xeon_sp/skx/Makefile.inc
64 files changed, 36 insertions(+), 31 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/31/44231/1
diff --git a/src/cpu/amd/agesa/family14/Kconfig b/src/cpu/amd/agesa/family14/Kconfig
index ecf8175..de8e326 100644
--- a/src/cpu/amd/agesa/family14/Kconfig
+++ b/src/cpu/amd/agesa/family14/Kconfig
@@ -5,6 +5,7 @@
select CPU_X86_CACHE
select CPU_X86_LAPIC
select CPU_X86_MTRR
+ select CPU_X86_SMM
select X86_AMD_FIXED_MTRRS
if CPU_AMD_AGESA_FAMILY14
diff --git a/src/cpu/amd/agesa/family14/Makefile.inc b/src/cpu/amd/agesa/family14/Makefile.inc
index 7dbb065..9576708 100644
--- a/src/cpu/amd/agesa/family14/Makefile.inc
+++ b/src/cpu/amd/agesa/family14/Makefile.inc
@@ -9,4 +9,3 @@
subdirs-y += ../../mtrr
subdirs-y += ../../../x86/tsc
subdirs-y += ../../../x86/pae
-subdirs-y += ../../../x86/smm
diff --git a/src/cpu/amd/agesa/family15tn/Kconfig b/src/cpu/amd/agesa/family15tn/Kconfig
index 525677c..df7ac26 100644
--- a/src/cpu/amd/agesa/family15tn/Kconfig
+++ b/src/cpu/amd/agesa/family15tn/Kconfig
@@ -5,6 +5,7 @@
select CPU_X86_CACHE
select CPU_X86_LAPIC
select CPU_X86_MTRR
+ select CPU_X86_SMM
select X86_AMD_FIXED_MTRRS
if CPU_AMD_AGESA_FAMILY15_TN
diff --git a/src/cpu/amd/agesa/family15tn/Makefile.inc b/src/cpu/amd/agesa/family15tn/Makefile.inc
index 357e80b..1d5779d 100644
--- a/src/cpu/amd/agesa/family15tn/Makefile.inc
+++ b/src/cpu/amd/agesa/family15tn/Makefile.inc
@@ -12,4 +12,3 @@
subdirs-y += ../../smm
subdirs-y += ../../../x86/tsc
subdirs-y += ../../../x86/pae
-subdirs-y += ../../../x86/smm
diff --git a/src/cpu/amd/agesa/family16kb/Kconfig b/src/cpu/amd/agesa/family16kb/Kconfig
index f87f241..0cafdf5 100644
--- a/src/cpu/amd/agesa/family16kb/Kconfig
+++ b/src/cpu/amd/agesa/family16kb/Kconfig
@@ -5,6 +5,7 @@
select CPU_X86_CACHE
select CPU_X86_LAPIC
select CPU_X86_MTRR
+ select CPU_X86_SMM
select X86_AMD_FIXED_MTRRS
if CPU_AMD_AGESA_FAMILY16_KB
diff --git a/src/cpu/amd/agesa/family16kb/Makefile.inc b/src/cpu/amd/agesa/family16kb/Makefile.inc
index b110dec..d775c54 100644
--- a/src/cpu/amd/agesa/family16kb/Makefile.inc
+++ b/src/cpu/amd/agesa/family16kb/Makefile.inc
@@ -9,4 +9,3 @@
subdirs-y += ../../mtrr
subdirs-y += ../../../x86/tsc
subdirs-y += ../../../x86/pae
-subdirs-y += ../../../x86/smm
diff --git a/src/cpu/amd/pi/00630F01/Kconfig b/src/cpu/amd/pi/00630F01/Kconfig
index 66df66d..65f66df 100644
--- a/src/cpu/amd/pi/00630F01/Kconfig
+++ b/src/cpu/amd/pi/00630F01/Kconfig
@@ -5,6 +5,7 @@
select CPU_X86_CACHE
select CPU_X86_LAPIC
select CPU_X86_MTRR
+ select CPU_X86_SMM
select X86_AMD_FIXED_MTRRS
if CPU_AMD_PI_00630F01
diff --git a/src/cpu/amd/pi/00630F01/Makefile.inc b/src/cpu/amd/pi/00630F01/Makefile.inc
index 357e80b..1d5779d 100644
--- a/src/cpu/amd/pi/00630F01/Makefile.inc
+++ b/src/cpu/amd/pi/00630F01/Makefile.inc
@@ -12,4 +12,3 @@
subdirs-y += ../../smm
subdirs-y += ../../../x86/tsc
subdirs-y += ../../../x86/pae
-subdirs-y += ../../../x86/smm
diff --git a/src/cpu/amd/pi/00660F01/Kconfig b/src/cpu/amd/pi/00660F01/Kconfig
index dff7a44..4b7a665 100644
--- a/src/cpu/amd/pi/00660F01/Kconfig
+++ b/src/cpu/amd/pi/00660F01/Kconfig
@@ -5,6 +5,7 @@
select CPU_X86_CACHE
select CPU_X86_LAPIC
select CPU_X86_MTRR
+ select CPU_X86_SMM
select X86_AMD_FIXED_MTRRS
if CPU_AMD_PI_00660F01
diff --git a/src/cpu/amd/pi/00660F01/Makefile.inc b/src/cpu/amd/pi/00660F01/Makefile.inc
index 6a2ab03..bcbc7fe 100644
--- a/src/cpu/amd/pi/00660F01/Makefile.inc
+++ b/src/cpu/amd/pi/00660F01/Makefile.inc
@@ -8,4 +8,3 @@
subdirs-y += ../../mtrr
subdirs-y += ../../../x86/tsc
subdirs-y += ../../../x86/pae
-subdirs-y += ../../../x86/smm
diff --git a/src/cpu/amd/pi/00730F01/Kconfig b/src/cpu/amd/pi/00730F01/Kconfig
index 25b72a7..4247189 100644
--- a/src/cpu/amd/pi/00730F01/Kconfig
+++ b/src/cpu/amd/pi/00730F01/Kconfig
@@ -5,6 +5,7 @@
select CPU_X86_CACHE
select CPU_X86_LAPIC
select CPU_X86_MTRR
+ select CPU_X86_SMM
select X86_AMD_FIXED_MTRRS
select SUPPORT_CPU_UCODE_IN_CBFS
select MICROCODE_BLOB_UNDISCLOSED
diff --git a/src/cpu/amd/pi/00730F01/Makefile.inc b/src/cpu/amd/pi/00730F01/Makefile.inc
index ea06ced..c33c642 100644
--- a/src/cpu/amd/pi/00730F01/Makefile.inc
+++ b/src/cpu/amd/pi/00730F01/Makefile.inc
@@ -10,4 +10,3 @@
subdirs-y += ../../mtrr
subdirs-y += ../../../x86/tsc
subdirs-y += ../../../x86/pae
-subdirs-y += ../../../x86/smm
diff --git a/src/cpu/intel/haswell/Kconfig b/src/cpu/intel/haswell/Kconfig
index 8e40c73..e234cab 100644
--- a/src/cpu/intel/haswell/Kconfig
+++ b/src/cpu/intel/haswell/Kconfig
@@ -12,6 +12,7 @@
select ARCH_RAMSTAGE_X86_32
select CPU_X86_LAPIC
select CPU_X86_MTRR
+ select CPU_X86_SMM
select MMX
select SSE2
select UDELAY_TSC
diff --git a/src/cpu/intel/haswell/Makefile.inc b/src/cpu/intel/haswell/Makefile.inc
index 247c266..2f2c128 100644
--- a/src/cpu/intel/haswell/Makefile.inc
+++ b/src/cpu/intel/haswell/Makefile.inc
@@ -15,7 +15,6 @@
subdirs-y += ../microcode
subdirs-y += ../turbo
-subdirs-y += ../../x86/smm
subdirs-y += ../../x86/tsc
cpu_microcode_bins += $(wildcard 3rdparty/intel-microcode/intel-ucode/06-3c-*)
diff --git a/src/cpu/intel/model_2065x/Kconfig b/src/cpu/intel/model_2065x/Kconfig
index 289aa62..9a7f6bb 100644
--- a/src/cpu/intel/model_2065x/Kconfig
+++ b/src/cpu/intel/model_2065x/Kconfig
@@ -12,6 +12,7 @@
select CPU_X86_CACHE
select CPU_X86_LAPIC
select CPU_X86_MTRR
+ select CPU_X86_SMM
select SSE2
select UDELAY_TSC
select TSC_MONOTONIC_TIMER
diff --git a/src/cpu/intel/model_2065x/Makefile.inc b/src/cpu/intel/model_2065x/Makefile.inc
index 99ef0ed..08b6191 100644
--- a/src/cpu/intel/model_2065x/Makefile.inc
+++ b/src/cpu/intel/model_2065x/Makefile.inc
@@ -15,7 +15,6 @@
subdirs-y += ../smm/gen1
subdirs-y += ../turbo
subdirs-y += ../../x86/name
-subdirs-y += ../../x86/smm
subdirs-y += ../../x86/tsc
cpu_microcode_bins += $(wildcard 3rdparty/intel-microcode/intel-ucode/06-25-*)
diff --git a/src/cpu/intel/model_206ax/Kconfig b/src/cpu/intel/model_206ax/Kconfig
index 500a717..cfb12d9 100644
--- a/src/cpu/intel/model_206ax/Kconfig
+++ b/src/cpu/intel/model_206ax/Kconfig
@@ -12,6 +12,7 @@
select CPU_X86_CACHE
select CPU_X86_LAPIC
select CPU_X86_MTRR
+ select CPU_X86_SMM
select MMX
select SSE2
select UDELAY_TSC
diff --git a/src/cpu/intel/model_206ax/Makefile.inc b/src/cpu/intel/model_206ax/Makefile.inc
index 5d44eef..00802fc 100644
--- a/src/cpu/intel/model_206ax/Makefile.inc
+++ b/src/cpu/intel/model_206ax/Makefile.inc
@@ -19,7 +19,6 @@
subdirs-y += ../smm/gen1
subdirs-y += ../turbo
subdirs-y += ../../x86/name
-subdirs-y += ../../x86/smm
subdirs-y += ../../x86/tsc
cpu_microcode_bins += $(wildcard 3rdparty/intel-microcode/intel-ucode/06-2a-*)
diff --git a/src/cpu/intel/slot_1/Kconfig b/src/cpu/intel/slot_1/Kconfig
index 8d0804e..ae48885 100644
--- a/src/cpu/intel/slot_1/Kconfig
+++ b/src/cpu/intel/slot_1/Kconfig
@@ -14,6 +14,7 @@
select CPU_INTEL_MODEL_6XX
select CPU_X86_LAPIC
select CPU_X86_MTRR
+ select CPU_X86_SMM
select NO_SMM
select UDELAY_TSC
select TSC_MONOTONIC_TIMER
diff --git a/src/cpu/intel/slot_1/Makefile.inc b/src/cpu/intel/slot_1/Makefile.inc
index de4dae6..c071ec8 100644
--- a/src/cpu/intel/slot_1/Makefile.inc
+++ b/src/cpu/intel/slot_1/Makefile.inc
@@ -8,7 +8,6 @@
subdirs-y += ../model_68x
subdirs-y += ../model_6bx
subdirs-y += ../../x86/tsc
-subdirs-y += ../../x86/smm
subdirs-y += ../microcode
bootblock-y += ../car/p3/cache_as_ram.S
diff --git a/src/cpu/intel/socket_441/Kconfig b/src/cpu/intel/socket_441/Kconfig
index 5852a10..c66e463 100644
--- a/src/cpu/intel/socket_441/Kconfig
+++ b/src/cpu/intel/socket_441/Kconfig
@@ -8,6 +8,7 @@
select CPU_INTEL_MODEL_106CX
select CPU_X86_LAPIC
select CPU_X86_MTRR
+ select CPU_X86_SMM
select MMX
select SSE
select SETUP_XIP_CACHE
diff --git a/src/cpu/intel/socket_441/Makefile.inc b/src/cpu/intel/socket_441/Makefile.inc
index c5b3223..a502290 100644
--- a/src/cpu/intel/socket_441/Makefile.inc
+++ b/src/cpu/intel/socket_441/Makefile.inc
@@ -10,5 +10,4 @@
subdirs-y += ../hyperthreading
subdirs-y += ../microcode
subdirs-y += ../speedstep
-subdirs-y += ../../x86/smm
subdirs-y += ../../x86/tsc
diff --git a/src/cpu/intel/socket_BGA956/Kconfig b/src/cpu/intel/socket_BGA956/Kconfig
index 9862038..8b92d36 100644
--- a/src/cpu/intel/socket_BGA956/Kconfig
+++ b/src/cpu/intel/socket_BGA956/Kconfig
@@ -3,6 +3,7 @@
select CPU_INTEL_MODEL_1067X
select CPU_X86_LAPIC
select CPU_X86_MTRR
+ select CPU_X86_SMM
select MMX
select SSE
diff --git a/src/cpu/intel/socket_BGA956/Makefile.inc b/src/cpu/intel/socket_BGA956/Makefile.inc
index de3c201..7c7149d 100644
--- a/src/cpu/intel/socket_BGA956/Makefile.inc
+++ b/src/cpu/intel/socket_BGA956/Makefile.inc
@@ -10,5 +10,4 @@
subdirs-y += ../hyperthreading
subdirs-y += ../microcode
subdirs-y += ../speedstep
-subdirs-y += ../../x86/smm
subdirs-y += ../../x86/tsc
diff --git a/src/cpu/intel/socket_FCBGA559/Kconfig b/src/cpu/intel/socket_FCBGA559/Kconfig
index b79427e..bb1e1a6 100644
--- a/src/cpu/intel/socket_FCBGA559/Kconfig
+++ b/src/cpu/intel/socket_FCBGA559/Kconfig
@@ -10,6 +10,7 @@
select CPU_INTEL_MODEL_106CX
select CPU_X86_LAPIC
select CPU_X86_MTRR
+ select CPU_X86_SMM
select MMX
select SSE
select CPU_HAS_L2_ENABLE_MSR
diff --git a/src/cpu/intel/socket_FCBGA559/Makefile.inc b/src/cpu/intel/socket_FCBGA559/Makefile.inc
index 47dd01d..8f360f1 100644
--- a/src/cpu/intel/socket_FCBGA559/Makefile.inc
+++ b/src/cpu/intel/socket_FCBGA559/Makefile.inc
@@ -10,5 +10,4 @@
subdirs-y += ../hyperthreading
subdirs-y += ../microcode
subdirs-y += ../speedstep
-subdirs-y += ../../x86/smm
subdirs-y += ../../x86/tsc
diff --git a/src/cpu/intel/socket_LGA775/Kconfig b/src/cpu/intel/socket_LGA775/Kconfig
index 9b039fc..ca0a513 100644
--- a/src/cpu/intel/socket_LGA775/Kconfig
+++ b/src/cpu/intel/socket_LGA775/Kconfig
@@ -11,6 +11,7 @@
select CPU_INTEL_MODEL_1067X
select CPU_X86_LAPIC
select CPU_X86_MTRR
+ select CPU_X86_SMM
select MMX
select SSE
select SIPI_VECTOR_IN_ROM
diff --git a/src/cpu/intel/socket_LGA775/Makefile.inc b/src/cpu/intel/socket_LGA775/Makefile.inc
index cfe19d1..5f3ef15 100644
--- a/src/cpu/intel/socket_LGA775/Makefile.inc
+++ b/src/cpu/intel/socket_LGA775/Makefile.inc
@@ -14,5 +14,4 @@
subdirs-y += ../hyperthreading
subdirs-y += ../microcode
subdirs-y += ../speedstep
-subdirs-y += ../../x86/smm
subdirs-y += ../../x86/tsc
diff --git a/src/cpu/intel/socket_m/Kconfig b/src/cpu/intel/socket_m/Kconfig
index 1860ff1..e13e1d0 100644
--- a/src/cpu/intel/socket_m/Kconfig
+++ b/src/cpu/intel/socket_m/Kconfig
@@ -9,6 +9,7 @@
select CPU_INTEL_MODEL_6FX
select CPU_X86_LAPIC
select CPU_X86_MTRR
+ select CPU_X86_SMM
select MMX
select SSE
diff --git a/src/cpu/intel/socket_m/Makefile.inc b/src/cpu/intel/socket_m/Makefile.inc
index 7f814cc..6d28bab 100644
--- a/src/cpu/intel/socket_m/Makefile.inc
+++ b/src/cpu/intel/socket_m/Makefile.inc
@@ -11,5 +11,4 @@
subdirs-y += ../hyperthreading
subdirs-y += ../microcode
subdirs-y += ../speedstep
-subdirs-y += ../../x86/smm
subdirs-y += ../../x86/tsc
diff --git a/src/cpu/intel/socket_mPGA604/Kconfig b/src/cpu/intel/socket_mPGA604/Kconfig
index bc3f5ba..02145d5 100644
--- a/src/cpu/intel/socket_mPGA604/Kconfig
+++ b/src/cpu/intel/socket_mPGA604/Kconfig
@@ -8,6 +8,7 @@
select CPU_INTEL_MODEL_F2X
select CPU_X86_LAPIC
select CPU_X86_MTRR
+ select CPU_X86_SMM
select MMX
select SSE
select UDELAY_TSC
diff --git a/src/cpu/intel/socket_mPGA604/Makefile.inc b/src/cpu/intel/socket_mPGA604/Makefile.inc
index 6d8b838..5e17ab8 100644
--- a/src/cpu/intel/socket_mPGA604/Makefile.inc
+++ b/src/cpu/intel/socket_mPGA604/Makefile.inc
@@ -1,6 +1,5 @@
subdirs-y += ../model_f2x
subdirs-y += ../../x86/tsc
-subdirs-y += ../../x86/smm
subdirs-y += ../microcode
subdirs-y += ../hyperthreading
diff --git a/src/cpu/intel/socket_p/Kconfig b/src/cpu/intel/socket_p/Kconfig
index 506fbeb..6c8c3f7 100644
--- a/src/cpu/intel/socket_p/Kconfig
+++ b/src/cpu/intel/socket_p/Kconfig
@@ -4,6 +4,7 @@
select CPU_INTEL_MODEL_6FX
select CPU_X86_LAPIC
select CPU_X86_MTRR
+ select CPU_X86_SMM
select MMX
select SSE
diff --git a/src/cpu/intel/socket_p/Makefile.inc b/src/cpu/intel/socket_p/Makefile.inc
index 3974e1c..5d5f520 100644
--- a/src/cpu/intel/socket_p/Makefile.inc
+++ b/src/cpu/intel/socket_p/Makefile.inc
@@ -11,5 +11,4 @@
subdirs-y += ../hyperthreading
subdirs-y += ../microcode
subdirs-y += ../speedstep
-subdirs-y += ../../x86/smm
subdirs-y += ../../x86/tsc
diff --git a/src/cpu/qemu-x86/Kconfig b/src/cpu/qemu-x86/Kconfig
index ad130f2..6ab327f 100644
--- a/src/cpu/qemu-x86/Kconfig
+++ b/src/cpu/qemu-x86/Kconfig
@@ -8,6 +8,7 @@
select ARCH_RAMSTAGE_X86_32
select CPU_X86_LAPIC
select CPU_X86_MTRR
+ select CPU_X86_SMM
select SMP
select UDELAY_TSC
select TSC_MONOTONIC_TIMER
diff --git a/src/cpu/qemu-x86/Makefile.inc b/src/cpu/qemu-x86/Makefile.inc
index c3d0aad..d2738cf 100644
--- a/src/cpu/qemu-x86/Makefile.inc
+++ b/src/cpu/qemu-x86/Makefile.inc
@@ -7,5 +7,4 @@
ramstage-y += qemu.c
-subdirs-y += ../x86/smm
subdirs-y += ../x86/tsc
diff --git a/src/cpu/x86/Kconfig b/src/cpu/x86/Kconfig
index 617e093..dddd911 100644
--- a/src/cpu/x86/Kconfig
+++ b/src/cpu/x86/Kconfig
@@ -10,6 +10,10 @@
bool
default n
+config CPU_X86_SMM
+ bool
+ default n
+
# TODO These two options look too similar
config PARALLEL_CPU_INIT
bool
diff --git a/src/cpu/x86/Makefile.inc b/src/cpu/x86/Makefile.inc
index ac30700..9616bb4 100644
--- a/src/cpu/x86/Makefile.inc
+++ b/src/cpu/x86/Makefile.inc
@@ -2,6 +2,7 @@
subdirs-$(CONFIG_CPU_X86_CACHE) += cache
subdirs-$(CONFIG_CPU_X86_LAPIC) += lapic
subdirs-$(CONFIG_CPU_X86_MTRR) += mtrr
+subdirs-$(CONFIG_CPU_X86_SMM) += smm
subdirs-$(CONFIG_PARALLEL_MP) += name
ramstage-$(CONFIG_PARALLEL_MP) += mp_init.c
ramstage-y += backup_default_smm.c
diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig
index 3d3968b..e6ed611 100644
--- a/src/soc/amd/picasso/Kconfig
+++ b/src/soc/amd/picasso/Kconfig
@@ -15,6 +15,7 @@
select ARCH_RAMSTAGE_X86_32
select CPU_X86_LAPIC
select CPU_X86_MTRR
+ select CPU_X86_SMM
select RESET_VECTOR_IN_RAM
select X86_AMD_FIXED_MTRRS
select X86_AMD_INIT_SIPI
diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc
index 3b2b497..b293eb6 100644
--- a/src/soc/amd/picasso/Makefile.inc
+++ b/src/soc/amd/picasso/Makefile.inc
@@ -5,7 +5,6 @@
subdirs-y += ../../../cpu/amd/mtrr/
subdirs-y += ../../../cpu/x86/tsc
subdirs-y += ../../../cpu/x86/pae
-subdirs-y += ../../../cpu/x86/smm
subdirs-$(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK) += psp_verstage
bootblock-y += bootblock/pre_c.S
diff --git a/src/soc/amd/stoneyridge/Kconfig b/src/soc/amd/stoneyridge/Kconfig
index ac629fd..59d2be5 100644
--- a/src/soc/amd/stoneyridge/Kconfig
+++ b/src/soc/amd/stoneyridge/Kconfig
@@ -15,6 +15,7 @@
select ARCH_RAMSTAGE_X86_32
select CPU_X86_LAPIC
select CPU_X86_MTRR
+ select CPU_X86_SMM
select X86_AMD_FIXED_MTRRS
select ACPI_AMD_HARDWARE_SLEEP_VALUES
select COLLECT_TIMESTAMPS_NO_TSC
diff --git a/src/soc/amd/stoneyridge/Makefile.inc b/src/soc/amd/stoneyridge/Makefile.inc
index 2019fb0..231f0d9 100644
--- a/src/soc/amd/stoneyridge/Makefile.inc
+++ b/src/soc/amd/stoneyridge/Makefile.inc
@@ -5,7 +5,6 @@
subdirs-y += ../../../cpu/amd/mtrr/
subdirs-y += ../../../cpu/x86/tsc
subdirs-y += ../../../cpu/x86/pae
-subdirs-y += ../../../cpu/x86/smm
bootblock-$(CONFIG_STONEYRIDGE_UART) += uart.c
bootblock-y += BiosCallOuts.c
diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig
index 2421d26..1b2337f 100644
--- a/src/soc/intel/apollolake/Kconfig
+++ b/src/soc/intel/apollolake/Kconfig
@@ -31,6 +31,7 @@
select CPU_INTEL_FIRMWARE_INTERFACE_TABLE
select CPU_X86_LAPIC
select CPU_X86_MTRR
+ select CPU_X86_SMM
select IOAPIC
select PCR_COMMON_IOSF_1_0
select SMP
diff --git a/src/soc/intel/apollolake/Makefile.inc b/src/soc/intel/apollolake/Makefile.inc
index 5e58538..1058cf2 100644
--- a/src/soc/intel/apollolake/Makefile.inc
+++ b/src/soc/intel/apollolake/Makefile.inc
@@ -3,7 +3,6 @@
subdirs-y += ../../../cpu/intel/common
subdirs-y += ../../../cpu/intel/microcode
subdirs-y += ../../../cpu/intel/turbo
-subdirs-y += ../../../cpu/x86/smm
subdirs-y += ../../../cpu/x86/tsc
bootblock-y += bootblock/bootblock.c
diff --git a/src/soc/intel/baytrail/Kconfig b/src/soc/intel/baytrail/Kconfig
index 3ac33cf..1f7a804 100644
--- a/src/soc/intel/baytrail/Kconfig
+++ b/src/soc/intel/baytrail/Kconfig
@@ -16,6 +16,7 @@
select CACHE_MRC_SETTINGS
select CPU_X86_LAPIC
select CPU_X86_MTRR
+ select CPU_X86_SMM
select CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED
select SUPPORT_CPU_UCODE_IN_CBFS
select HAVE_SMI_HANDLER
diff --git a/src/soc/intel/baytrail/Makefile.inc b/src/soc/intel/baytrail/Makefile.inc
index a2e4340..fa8519e 100644
--- a/src/soc/intel/baytrail/Makefile.inc
+++ b/src/soc/intel/baytrail/Makefile.inc
@@ -1,7 +1,6 @@
ifeq ($(CONFIG_SOC_INTEL_BAYTRAIL),y)
subdirs-y += romstage
-subdirs-y += ../../../cpu/x86/smm
subdirs-y += ../../../cpu/x86/tsc
subdirs-y += ../../../cpu/intel/microcode
subdirs-y += ../../../cpu/intel/turbo
diff --git a/src/soc/intel/braswell/Kconfig b/src/soc/intel/braswell/Kconfig
index b02f4f3..c5ff0fa 100644
--- a/src/soc/intel/braswell/Kconfig
+++ b/src/soc/intel/braswell/Kconfig
@@ -16,6 +16,7 @@
select CACHE_MRC_SETTINGS
select CPU_X86_LAPIC
select CPU_X86_MTRR
+ select CPU_X86_SMM
select SUPPORT_CPU_UCODE_IN_CBFS
select CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED
select HAVE_SMI_HANDLER
diff --git a/src/soc/intel/braswell/Makefile.inc b/src/soc/intel/braswell/Makefile.inc
index 701424b..df52b7f 100644
--- a/src/soc/intel/braswell/Makefile.inc
+++ b/src/soc/intel/braswell/Makefile.inc
@@ -1,7 +1,6 @@
ifeq ($(CONFIG_SOC_INTEL_BRASWELL),y)
subdirs-y += romstage
-subdirs-y += ../../../cpu/x86/smm
subdirs-y += ../../../cpu/x86/tsc
subdirs-y += ../../../cpu/intel/microcode
subdirs-y += ../../../cpu/intel/turbo
diff --git a/src/soc/intel/broadwell/Kconfig b/src/soc/intel/broadwell/Kconfig
index 515026b..bd810ad 100644
--- a/src/soc/intel/broadwell/Kconfig
+++ b/src/soc/intel/broadwell/Kconfig
@@ -19,6 +19,7 @@
select CPU_INTEL_FIRMWARE_INTERFACE_TABLE
select CPU_X86_LAPIC
select CPU_X86_MTRR
+ select CPU_X86_SMM
select SUPPORT_CPU_UCODE_IN_CBFS
select HAVE_SMI_HANDLER
select SOUTHBRIDGE_INTEL_COMMON_RESET
diff --git a/src/soc/intel/broadwell/Makefile.inc b/src/soc/intel/broadwell/Makefile.inc
index da42f35..1a361e5 100644
--- a/src/soc/intel/broadwell/Makefile.inc
+++ b/src/soc/intel/broadwell/Makefile.inc
@@ -1,7 +1,6 @@
ifeq ($(CONFIG_SOC_INTEL_BROADWELL),y)
subdirs-y += romstage
-subdirs-y += ../../../cpu/x86/smm
subdirs-y += ../../../cpu/x86/tsc
subdirs-y += ../../../cpu/intel/microcode
subdirs-y += ../../../cpu/intel/turbo
diff --git a/src/soc/intel/cannonlake/Kconfig b/src/soc/intel/cannonlake/Kconfig
index a77a8a1..9c7bad9 100644
--- a/src/soc/intel/cannonlake/Kconfig
+++ b/src/soc/intel/cannonlake/Kconfig
@@ -69,6 +69,7 @@
select CPU_INTEL_FIRMWARE_INTERFACE_TABLE
select CPU_X86_LAPIC
select CPU_X86_MTRR
+ select CPU_X86_SMM
select FSP_COMPRESS_FSP_S_LZMA
select FSP_M_XIP
select GENERIC_GPIO_LIB
diff --git a/src/soc/intel/cannonlake/Makefile.inc b/src/soc/intel/cannonlake/Makefile.inc
index ec4e82b..c4ef987 100644
--- a/src/soc/intel/cannonlake/Makefile.inc
+++ b/src/soc/intel/cannonlake/Makefile.inc
@@ -3,7 +3,6 @@
subdirs-y += romstage
subdirs-y += ../../../cpu/intel/microcode
subdirs-y += ../../../cpu/intel/turbo
-subdirs-y += ../../../cpu/x86/smm
subdirs-y += ../../../cpu/x86/tsc
subdirs-y += ../../../cpu/intel/common
diff --git a/src/soc/intel/denverton_ns/Kconfig b/src/soc/intel/denverton_ns/Kconfig
index 7532ccb..18dba59 100644
--- a/src/soc/intel/denverton_ns/Kconfig
+++ b/src/soc/intel/denverton_ns/Kconfig
@@ -17,6 +17,7 @@
select BOOT_DEVICE_SUPPORTS_WRITES
select CPU_X86_LAPIC
select CPU_X86_MTRR
+ select CPU_X86_SMM
select DEBUG_GPIO
select SOC_INTEL_COMMON
select SOC_INTEL_COMMON_RESET
diff --git a/src/soc/intel/denverton_ns/Makefile.inc b/src/soc/intel/denverton_ns/Makefile.inc
index 3bd2106..84dc846 100644
--- a/src/soc/intel/denverton_ns/Makefile.inc
+++ b/src/soc/intel/denverton_ns/Makefile.inc
@@ -4,7 +4,6 @@
subdirs-y += ../../../cpu/intel/microcode
subdirs-y += ../../../cpu/intel/turbo
-subdirs-y += ../../../cpu/x86/smm
subdirs-y += ../../../cpu/x86/tsc
bootblock-y += bootblock/bootblock.c
diff --git a/src/soc/intel/icelake/Kconfig b/src/soc/intel/icelake/Kconfig
index b2cf82d..b6453cd 100644
--- a/src/soc/intel/icelake/Kconfig
+++ b/src/soc/intel/icelake/Kconfig
@@ -18,6 +18,7 @@
select CPU_INTEL_FIRMWARE_INTERFACE_TABLE
select CPU_X86_LAPIC
select CPU_X86_MTRR
+ select CPU_X86_SMM
select FSP_M_XIP
select GENERIC_GPIO_LIB
select HAVE_FSP_GOP
diff --git a/src/soc/intel/icelake/Makefile.inc b/src/soc/intel/icelake/Makefile.inc
index 8ae39f7..4d744bc 100644
--- a/src/soc/intel/icelake/Makefile.inc
+++ b/src/soc/intel/icelake/Makefile.inc
@@ -3,7 +3,6 @@
subdirs-y += romstage
subdirs-y += ../../../cpu/intel/microcode
subdirs-y += ../../../cpu/intel/turbo
-subdirs-y += ../../../cpu/x86/smm
subdirs-y += ../../../cpu/x86/tsc
# all (bootblock, verstage, romstage, postcar, ramstage)
diff --git a/src/soc/intel/jasperlake/Kconfig b/src/soc/intel/jasperlake/Kconfig
index eb34598..a3a673d 100644
--- a/src/soc/intel/jasperlake/Kconfig
+++ b/src/soc/intel/jasperlake/Kconfig
@@ -19,6 +19,7 @@
select CPU_INTEL_FIRMWARE_INTERFACE_TABLE
select CPU_X86_LAPIC
select CPU_X86_MTRR
+ select CPU_X86_SMM
select FSP_COMPRESS_FSP_S_LZ4
select FSP_M_XIP
select GENERIC_GPIO_LIB
diff --git a/src/soc/intel/jasperlake/Makefile.inc b/src/soc/intel/jasperlake/Makefile.inc
index f87d0fd..8262c32 100644
--- a/src/soc/intel/jasperlake/Makefile.inc
+++ b/src/soc/intel/jasperlake/Makefile.inc
@@ -3,7 +3,6 @@
subdirs-y += romstage
subdirs-y += ../../../cpu/intel/microcode
subdirs-y += ../../../cpu/intel/turbo
-subdirs-y += ../../../cpu/x86/smm
subdirs-y += ../../../cpu/x86/tsc
# all (bootblock, verstage, romstage, postcar, ramstage)
diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig
index 37ae68d..a753db8 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@@ -31,6 +31,7 @@
select CPU_INTEL_COMMON_HYPERTHREADING
select CPU_X86_LAPIC
select CPU_X86_MTRR
+ select CPU_X86_SMM
select FSP_M_XIP
select GENERIC_GPIO_LIB
select HAVE_FSP_GOP
diff --git a/src/soc/intel/skylake/Makefile.inc b/src/soc/intel/skylake/Makefile.inc
index c858d1e..9dbfa26 100644
--- a/src/soc/intel/skylake/Makefile.inc
+++ b/src/soc/intel/skylake/Makefile.inc
@@ -5,7 +5,6 @@
subdirs-y += ../../../cpu/intel/common
subdirs-y += ../../../cpu/intel/microcode
subdirs-y += ../../../cpu/intel/turbo
-subdirs-y += ../../../cpu/x86/smm
subdirs-y += ../../../cpu/x86/tsc
bootblock-y += bootblock/bootblock.c
diff --git a/src/soc/intel/tigerlake/Kconfig b/src/soc/intel/tigerlake/Kconfig
index 8c73d76..c3105c8 100644
--- a/src/soc/intel/tigerlake/Kconfig
+++ b/src/soc/intel/tigerlake/Kconfig
@@ -19,6 +19,7 @@
select CPU_INTEL_FIRMWARE_INTERFACE_TABLE
select CPU_X86_LAPIC
select CPU_X86_MTRR
+ select CPU_X86_SMM
select FSP_COMPRESS_FSP_S_LZ4
select FSP_M_XIP
select GENERIC_GPIO_LIB
diff --git a/src/soc/intel/tigerlake/Makefile.inc b/src/soc/intel/tigerlake/Makefile.inc
index 27b62a0..848a5b0 100644
--- a/src/soc/intel/tigerlake/Makefile.inc
+++ b/src/soc/intel/tigerlake/Makefile.inc
@@ -3,7 +3,6 @@
subdirs-y += romstage
subdirs-y += ../../../cpu/intel/microcode
subdirs-y += ../../../cpu/intel/turbo
-subdirs-y += ../../../cpu/x86/smm
subdirs-y += ../../../cpu/x86/tsc
# all (bootblock, verstage, romstage, postcar, ramstage)
diff --git a/src/soc/intel/xeon_sp/Kconfig b/src/soc/intel/xeon_sp/Kconfig
index 540212c..7ab0ed0 100644
--- a/src/soc/intel/xeon_sp/Kconfig
+++ b/src/soc/intel/xeon_sp/Kconfig
@@ -8,6 +8,7 @@
config SOC_INTEL_SKYLAKE_SP
bool
+ select CPU_X86_SMM if HAVE_SMI_HANDLER
select XEON_SP_COMMON_BASE
select PLATFORM_USES_FSP2_0
help
diff --git a/src/soc/intel/xeon_sp/skx/Makefile.inc b/src/soc/intel/xeon_sp/skx/Makefile.inc
index db29e1c..7d4ece7 100644
--- a/src/soc/intel/xeon_sp/skx/Makefile.inc
+++ b/src/soc/intel/xeon_sp/skx/Makefile.inc
@@ -5,7 +5,6 @@
subdirs-y += ../../../../cpu/intel/microcode
subdirs-y += ../../../../cpu/intel/turbo
subdirs-y += ../../../../cpu/x86/tsc
-subdirs-$(CONFIG_HAVE_SMI_HANDLER) += ../../../cpu/x86/smm
postcar-y += soc_util.c
To view, visit change 44231. To unsubscribe, or for help writing mail filters, visit settings.