5 files changed, 7 insertions, 31 deletions
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
index 36a8460f45..6cc991c3f7 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
@@ -19,6 +19,8 @@ config BOARD_AMD_SERENGETI_CHEETAH_FAM10
 	select AMDMCT
 	select HAVE_ACPI_TABLES
 	select BOARD_ROMSIZE_KB_1024
+	select ENABLE_APIC_EXT_ID
+	select LIFT_BSP_APIC_ID
 
 config MAINBOARD_DIR
 	string
@@ -121,12 +123,3 @@ config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	default 0x1022
 	depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10
 
-config ENABLE_APIC_EXT_ID
-	bool
-	default y
-	depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10
-
-config LIFT_BSP_APIC_ID
-	bool
-	default y
-	depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10
diff --git a/src/mainboard/kontron/kt690/Kconfig b/src/mainboard/kontron/kt690/Kconfig
index 0d939306d5..068fd9a143 100644
--- a/src/mainboard/kontron/kt690/Kconfig
+++ b/src/mainboard/kontron/kt690/Kconfig
@@ -18,6 +18,7 @@ config BOARD_KONTRON_KT690
 	select IOAPIC
 	select HAVE_ACPI_TABLES
 	select BOARD_ROMSIZE_KB_512
+	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 
 config MAINBOARD_DIR
 	string
@@ -99,11 +100,6 @@ config SB_HT_CHAIN_ON_BUS0
 	default 1
 	depends on BOARD_KONTRON_KT690
 
-config SB_HT_CHAIN_UNITID_OFFSET_ONLY
-	bool
-	default y
-	depends on BOARD_KONTRON_KT690
-
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x1
diff --git a/src/mainboard/supermicro/x6dhe_g/Kconfig b/src/mainboard/supermicro/x6dhe_g/Kconfig
index 40bdd07483..0b8da81d25 100644
--- a/src/mainboard/supermicro/x6dhe_g/Kconfig
+++ b/src/mainboard/supermicro/x6dhe_g/Kconfig
@@ -9,6 +9,7 @@ config BOARD_SUPERMICRO_X6DHE_G
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
 	select BOARD_ROMSIZE_KB_1024
+	select DRIVERS_GENERIC_DEBUG
 
 config MAINBOARD_DIR
 	string
@@ -55,7 +56,3 @@ config IRQ_SLOT_COUNT
 	default 15
 	depends on BOARD_SUPERMICRO_X6DHE_G
 
-config DRIVERS_GENERIC_DEBUG
-	bool
-	default y
-	depends on BOARD_SUPERMICRO_X6DHE_G
diff --git a/src/mainboard/supermicro/x6dhe_g2/Kconfig b/src/mainboard/supermicro/x6dhe_g2/Kconfig
index f999212e31..3593a2613f 100644
--- a/src/mainboard/supermicro/x6dhe_g2/Kconfig
+++ b/src/mainboard/supermicro/x6dhe_g2/Kconfig
@@ -9,6 +9,7 @@ config BOARD_SUPERMICRO_X6DHE_G2
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
 	select BOARD_ROMSIZE_KB_1024
+	select DRIVERS_GENERIC_DEBUG
 
 config MAINBOARD_DIR
 	string
@@ -55,7 +56,3 @@ config IRQ_SLOT_COUNT
 	default 15
 	depends on BOARD_SUPERMICRO_X6DHE_G2
 
-config DRIVERS_GENERIC_DEBUG
-	bool
-	default y
-	depends on BOARD_SUPERMICRO_X6DHE_G2
diff --git a/src/mainboard/tyan/s2912_fam10/Kconfig b/src/mainboard/tyan/s2912_fam10/Kconfig
index eb841dbd7e..e4aee22236 100644
--- a/src/mainboard/tyan/s2912_fam10/Kconfig
+++ b/src/mainboard/tyan/s2912_fam10/Kconfig
@@ -16,6 +16,8 @@ config BOARD_TYAN_S2912_FAM10
 	select MEM_TRAIN_SEQ
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select BOARD_ROMSIZE_KB_1024
+	select ENABLE_APIC_EXT_ID
+	select AMDMCT
 
 config MAINBOARD_DIR
 	string
@@ -147,12 +149,3 @@ config AMD_UCODE_PATCH_FILE
 	default "mc_patch_01000095.h"
 	depends on BOARD_TYAN_S2912_FAM10
 
-config ENABLE_APIC_EXT_ID
-	bool
-	default y
-	depends on BOARD_TYAN_S2912_FAM10
-
-config AMDMCT
-	bool
-	default y
-	depends on BOARD_TYAN_S2912_FAM10