5 files changed, 7 insertions, 11 deletions
diff --git a/src/southbridge/intel/i82801dx/Makefile.inc b/src/southbridge/intel/i82801dx/Makefile.inc
index 030f7b4be2..ff100919e6 100644
--- a/src/southbridge/intel/i82801dx/Makefile.inc
+++ b/src/southbridge/intel/i82801dx/Makefile.inc
@@ -11,10 +11,8 @@ ramstage-y += lpc.c
 ramstage-y += usb.c
 ramstage-y += usb2.c
 
-ifeq ($(CONFIG_SMM_ASEG),y)
-ramstage-$(CONFIG_HAVE_SMI_HANDLER) += smi.c
-ramstage-$(CONFIG_HAVE_SMI_HANDLER) += ../../../cpu/x86/smm/smmrelocate.S
-endif
+ramstage-$(CONFIG_SMM_LEGACY_ASEG) += smi.c
+ramstage-$(CONFIG_SMM_LEGACY_ASEG) += ../../../cpu/x86/smm/smmrelocate.S
 
 smm-y += smihandler.c
 
diff --git a/src/southbridge/intel/i82801dx/lpc.c b/src/southbridge/intel/i82801dx/lpc.c
index bb38e1ab56..972ca76462 100644
--- a/src/southbridge/intel/i82801dx/lpc.c
+++ b/src/southbridge/intel/i82801dx/lpc.c
@@ -279,7 +279,7 @@ static void lpc_init(struct device *dev)
 	/* Don't allow evil boot loaders, kernels, or
 	 * userspace applications to deceive us:
 	 */
-	if (CONFIG(HAVE_SMI_HANDLER) && !CONFIG(PARALLEL_MP))
+	if (CONFIG(SMM_LEGACY_ASEG))
 		aseg_smm_lock();
 }
 
diff --git a/src/southbridge/intel/i82801ix/Makefile.inc b/src/southbridge/intel/i82801ix/Makefile.inc
index dada88511d..d376622850 100644
--- a/src/southbridge/intel/i82801ix/Makefile.inc
+++ b/src/southbridge/intel/i82801ix/Makefile.inc
@@ -28,10 +28,8 @@ ifneq ($(CONFIG_BOARD_EMULATION_QEMU_X86_Q35),y)
 ramstage-y += madt.c
 endif
 
-ifeq ($(CONFIG_SMM_ASEG),y)
-ramstage-$(CONFIG_HAVE_SMI_HANDLER) += smi.c
-ramstage-$(CONFIG_HAVE_SMI_HANDLER) += ../../../cpu/x86/smm/smmrelocate.S
-endif
+ramstage-$(CONFIG_SMM_LEGACY_ASEG) += smi.c
+ramstage-$(CONFIG_SMM_LEGACY_ASEG) += ../../../cpu/x86/smm/smmrelocate.S
 
 CPPFLAGS_common += -I$(src)/southbridge/intel/i82801ix/include
 
diff --git a/src/southbridge/intel/i82801ix/lpc.c b/src/southbridge/intel/i82801ix/lpc.c
index 21f1faa3b7..0132ac5b89 100644
--- a/src/southbridge/intel/i82801ix/lpc.c
+++ b/src/southbridge/intel/i82801ix/lpc.c
@@ -378,7 +378,7 @@ static void lpc_init(struct device *dev)
 	/* Don't allow evil boot loaders, kernels, or
 	 * userspace applications to deceive us:
 	 */
-	if (CONFIG(HAVE_SMI_HANDLER) && !CONFIG(PARALLEL_MP))
+	if (CONFIG(SMM_LEGACY_ASEG))
 		aseg_smm_lock();
 }
 
diff --git a/src/southbridge/intel/i82801ix/smihandler.c b/src/southbridge/intel/i82801ix/smihandler.c
index 0483447e94..e02b3965a0 100644
--- a/src/southbridge/intel/i82801ix/smihandler.c
+++ b/src/southbridge/intel/i82801ix/smihandler.c
@@ -9,7 +9,7 @@
 
 #include <soc/nvs.h>
 
-#if !CONFIG(SMM_TSEG)
+#if CONFIG(SMM_LEGACY_ASEG)
 /* For qemu/x86-q35 to build properly. */
 struct global_nvs *gnvs;
 #endif