19 files changed, 14 insertions, 18 deletions
diff --git a/src/mainboard/asus/m2v-mx_se/Kconfig b/src/mainboard/asus/m2v-mx_se/Kconfig
index de5511e6bb..0ee9058f44 100644
--- a/src/mainboard/asus/m2v-mx_se/Kconfig
+++ b/src/mainboard/asus/m2v-mx_se/Kconfig
@@ -31,15 +31,12 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SUPERIO_ITE_IT8712F
 	select HAVE_OPTION_TABLE
 	select HAVE_ACPI_TABLES
-	select HAVE_SMI_HANDLER
 	select BOARD_ROMSIZE_KB_512
 	select RAMINIT_SYSINFO
 	select VGA
 	select HAVE_ACPI_RESUME
 	select QRANK_DIMM_SUPPORT
 	select SET_FIDVID
-	# TODO test on multicore machines and enable if it works:
-	#select HAVE_SMI_HANDLER
 
 config MAINBOARD_DIR
 	string
diff --git a/src/mainboard/getac/p470/Kconfig b/src/mainboard/getac/p470/Kconfig
index d1c6f7fac6..dc0822592c 100644
--- a/src/mainboard/getac/p470/Kconfig
+++ b/src/mainboard/getac/p470/Kconfig
@@ -39,7 +39,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_ACPI_SLIC
 	select MMCONF_SUPPORT
 	select UDELAY_LAPIC
-	select HAVE_SMI_HANDLER
 	select BOARD_ROMSIZE_KB_1024
 	select GFXUMA
 	select CHANNEL_XOR_RANDOMIZATION
diff --git a/src/mainboard/ibase/mb899/Kconfig b/src/mainboard/ibase/mb899/Kconfig
index 28abf43345..26f753b78a 100644
--- a/src/mainboard/ibase/mb899/Kconfig
+++ b/src/mainboard/ibase/mb899/Kconfig
@@ -16,7 +16,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_OPTION_TABLE
 	select HAVE_ACPI_RESUME
 	select MMCONF_SUPPORT
-	select HAVE_SMI_HANDLER
 	select BOARD_ROMSIZE_KB_512
 	select GFXUMA
 	select CHANNEL_XOR_RANDOMIZATION
diff --git a/src/mainboard/intel/d945gclf/Kconfig b/src/mainboard/intel/d945gclf/Kconfig
index 57078da639..69f23809ef 100644
--- a/src/mainboard/intel/d945gclf/Kconfig
+++ b/src/mainboard/intel/d945gclf/Kconfig
@@ -37,7 +37,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_ACPI_TABLES
 	select HAVE_ACPI_RESUME
 	select MMCONF_SUPPORT
-	select HAVE_SMI_HANDLER
 	select BOARD_ROMSIZE_KB_512
 	select GFXUMA
 	select CHANNEL_XOR_RANDOMIZATION
diff --git a/src/mainboard/intel/emeraldlake2/Kconfig b/src/mainboard/intel/emeraldlake2/Kconfig
index aaca694072..064460305c 100644
--- a/src/mainboard/intel/emeraldlake2/Kconfig
+++ b/src/mainboard/intel/emeraldlake2/Kconfig
@@ -13,7 +13,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_OPTION_TABLE
 	select HAVE_ACPI_RESUME
 	select MMCONF_SUPPORT
-	select HAVE_SMI_HANDLER
 	select GFXUMA
 	#select CHROMEOS
 	select EXTERNAL_MRC_BLOB
diff --git a/src/mainboard/iwave/iWRainbowG6/Kconfig b/src/mainboard/iwave/iWRainbowG6/Kconfig
index d429a3246b..3d574b676b 100644
--- a/src/mainboard/iwave/iWRainbowG6/Kconfig
+++ b/src/mainboard/iwave/iWRainbowG6/Kconfig
@@ -14,7 +14,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select USE_PRINTK_IN_CAR
 	select UDELAY_LAPIC
 	select HAVE_ACPI_TABLES
-	select HAVE_SMI_HANDLER
 	select BOARD_ROMSIZE_KB_1024
 	select GFXUMA
 
diff --git a/src/mainboard/kontron/986lcd-m/Kconfig b/src/mainboard/kontron/986lcd-m/Kconfig
index 49cc70ef9f..99b6369a03 100644
--- a/src/mainboard/kontron/986lcd-m/Kconfig
+++ b/src/mainboard/kontron/986lcd-m/Kconfig
@@ -16,7 +16,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_OPTION_TABLE
 	select HAVE_ACPI_RESUME
 	select MMCONF_SUPPORT
-	select HAVE_SMI_HANDLER
 	select BOARD_ROMSIZE_KB_1024
 	select GFXUMA
 	select CHANNEL_XOR_RANDOMIZATION
diff --git a/src/mainboard/lenovo/t60/Kconfig b/src/mainboard/lenovo/t60/Kconfig
index 062a459523..630f805d4d 100644
--- a/src/mainboard/lenovo/t60/Kconfig
+++ b/src/mainboard/lenovo/t60/Kconfig
@@ -21,7 +21,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select GFXUMA
 	select BOARD_ROMSIZE_KB_2048
 	select CHANNEL_XOR_RANDOMIZATION
-	select HAVE_SMI_HANDLER
 	select HAVE_ACPI_TABLES
 	select HAVE_ACPI_RESUME
 config MAINBOARD_DIR
diff --git a/src/mainboard/lenovo/x60/Kconfig b/src/mainboard/lenovo/x60/Kconfig
index e77fac6a01..653f1200cb 100644
--- a/src/mainboard/lenovo/x60/Kconfig
+++ b/src/mainboard/lenovo/x60/Kconfig
@@ -21,7 +21,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select GFXUMA
 	select BOARD_ROMSIZE_KB_2048
 	select CHANNEL_XOR_RANDOMIZATION
-	select HAVE_SMI_HANDLER
 	select HAVE_ACPI_TABLES
 	select HAVE_ACPI_RESUME
 	select USE_OPTION_TABLE
diff --git a/src/mainboard/rca/rm4100/Kconfig b/src/mainboard/rca/rm4100/Kconfig
index 5247a8c35e..ecbd2ccafc 100644
--- a/src/mainboard/rca/rm4100/Kconfig
+++ b/src/mainboard/rca/rm4100/Kconfig
@@ -10,7 +10,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_PIRQ_TABLE
 	select UDELAY_TSC
 	select BOARD_ROMSIZE_KB_1024
-	select HAVE_SMI_HANDLER
 	select GFXUMA
 
 config MAINBOARD_DIR
diff --git a/src/mainboard/roda/rk886ex/Kconfig b/src/mainboard/roda/rk886ex/Kconfig
index d4553ec7ea..c770839fef 100644
--- a/src/mainboard/roda/rk886ex/Kconfig
+++ b/src/mainboard/roda/rk886ex/Kconfig
@@ -16,7 +16,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
 	select MMCONF_SUPPORT
-	select HAVE_SMI_HANDLER
 	select HAVE_ACPI_TABLES
 	select HAVE_ACPI_RESUME
 	select BOARD_ROMSIZE_KB_1024
diff --git a/src/mainboard/samsung/lumpy/Kconfig b/src/mainboard/samsung/lumpy/Kconfig
index eae80fabb2..7cb070678c 100644
--- a/src/mainboard/samsung/lumpy/Kconfig
+++ b/src/mainboard/samsung/lumpy/Kconfig
@@ -13,7 +13,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
 	select HAVE_OPTION_TABLE
-	select HAVE_SMI_HANDLER
 	select MMCONF_SUPPORT
 	select NORTHBRIDGE_INTEL_SANDYBRIDGE
 	select SOUTHBRIDGE_INTEL_BD82X6X
diff --git a/src/mainboard/samsung/stumpy/Kconfig b/src/mainboard/samsung/stumpy/Kconfig
index f16809fdc1..4353d54e28 100644
--- a/src/mainboard/samsung/stumpy/Kconfig
+++ b/src/mainboard/samsung/stumpy/Kconfig
@@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
 	select HAVE_OPTION_TABLE
-	select HAVE_SMI_HANDLER
 	select MMCONF_SUPPORT
 	select NORTHBRIDGE_INTEL_SANDYBRIDGE
 	select SOUTHBRIDGE_INTEL_BD82X6X
diff --git a/src/mainboard/thomson/ip1000/Kconfig b/src/mainboard/thomson/ip1000/Kconfig
index f9bbfa53f1..b1988ddae6 100644
--- a/src/mainboard/thomson/ip1000/Kconfig
+++ b/src/mainboard/thomson/ip1000/Kconfig
@@ -10,7 +10,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_PIRQ_TABLE
 	select UDELAY_TSC
 	select BOARD_ROMSIZE_KB_512
-	select HAVE_SMI_HANDLER
 	select GFXUMA
 
 config MAINBOARD_DIR
diff --git a/src/southbridge/intel/bd82x6x/Kconfig b/src/southbridge/intel/bd82x6x/Kconfig
index e330fb4382..e5a6270469 100644
--- a/src/southbridge/intel/bd82x6x/Kconfig
+++ b/src/southbridge/intel/bd82x6x/Kconfig
@@ -30,6 +30,7 @@ config SOUTH_BRIDGE_OPTIONS # dummy
 	select IOAPIC
 	select HAVE_HARD_RESET
 	select HAVE_USBDEBUG
+	select HAVE_SMI_HANDLER
 	select USE_WATCHDOG_ON_BOOT
 	select PCIEXP_ASPM
 	select PCIEXP_COMMON_CLOCK
diff --git a/src/southbridge/intel/i82801dx/Kconfig b/src/southbridge/intel/i82801dx/Kconfig
index 5d4e15ac87..bad9936a54 100644
--- a/src/southbridge/intel/i82801dx/Kconfig
+++ b/src/southbridge/intel/i82801dx/Kconfig
@@ -23,3 +23,4 @@ config SOUTHBRIDGE_INTEL_I82801DX
 	bool
 	select IOAPIC
 	select HAVE_HARD_RESET
+	select HAVE_SMI_HANDLER
diff --git a/src/southbridge/intel/i82801gx/Kconfig b/src/southbridge/intel/i82801gx/Kconfig
index 4937df7096..4ce61849a5 100644
--- a/src/southbridge/intel/i82801gx/Kconfig
+++ b/src/southbridge/intel/i82801gx/Kconfig
@@ -23,6 +23,7 @@ config SOUTHBRIDGE_INTEL_I82801GX
 	select HAVE_HARD_RESET
 	select HAVE_USBDEBUG
 	select USE_WATCHDOG_ON_BOOT
+	select HAVE_SMI_HANDLER
 
 if SOUTHBRIDGE_INTEL_I82801GX
 
diff --git a/src/southbridge/intel/sch/Kconfig b/src/southbridge/intel/sch/Kconfig
index 32eb8688ec..24daa7943b 100644
--- a/src/southbridge/intel/sch/Kconfig
+++ b/src/southbridge/intel/sch/Kconfig
@@ -21,6 +21,7 @@ config SOUTHBRIDGE_INTEL_SCH
 	bool
 	select HAVE_USBDEBUG
 	select HAVE_HARD_RESET
+	select HAVE_SMI_HANDLER
 
 if SOUTHBRIDGE_INTEL_SCH
 
diff --git a/src/southbridge/via/vt8237r/Kconfig b/src/southbridge/via/vt8237r/Kconfig
index d0a6deb60c..8deea9278b 100644
--- a/src/southbridge/via/vt8237r/Kconfig
+++ b/src/southbridge/via/vt8237r/Kconfig
@@ -22,12 +22,20 @@ config SOUTHBRIDGE_VIA_VT8237R
 	select HAVE_DEBUG_SMBUS
 	select IOAPIC
 
+if SOUTHBRIDGE_VIA_VT8237R
+
+if NORTHBRIDGE_AMD_K8 || NORTHBRIDGE_AMD_FAM10
+config SOUTH_BRIDGE_OPTIONS # dummy
+	def_bool y
+	select HAVE_SMI_HANDLER
+endif
+
 config EPIA_VT8237R_INIT
 	bool
 	default n
-	depends on SOUTHBRIDGE_VIA_VT8237R
 
 config BOOTBLOCK_SOUTHBRIDGE_INIT
 	string
 	default "southbridge/via/vt8237r/bootblock.c"
-	depends on SOUTHBRIDGE_VIA_VT8237R
+
+endif